diff --git a/.jshintrc b/.jshintrc index 4247ffb3..2b885e31 100644 --- a/.jshintrc +++ b/.jshintrc @@ -31,7 +31,9 @@ "map_store": false, "deactivateChoropleth": false, "window": false, - "subscribeToEvents": false + "subscribeToEvents": false, + "createChart": false, + "hidePotentialLayers": false }, "strict": "implied" } diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 990ea49a..18e7de91 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ fail_fast: true repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.4.0 hooks: - id: check-json - id: end-of-file-fixer @@ -12,21 +12,21 @@ repos: - id: check-added-large-files - repo: https://github.com/pre-commit/mirrors-jshint - rev: v2.13.5 + rev: v2.13.6 hooks: - id: jshint + - repo: https://github.com/psf/black + rev: 23.3.0 + hooks: + - id: black + - repo: https://github.com/charliermarsh/ruff-pre-commit # Ruff version. - rev: 'v0.0.272' + rev: 'v0.0.277' hooks: - id: ruff - - repo: https://github.com/psf/black - rev: 23.1.0 - hooks: - - id: black - - repo: https://github.com/PyCQA/flake8 rev: 6.0.0 hooks: diff --git a/CHANGELOG.md b/CHANGELOG.md index 9054af14..5e4d581a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project tries to adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.5.0] - 2023-07-13 +### Added +- heat settings set for oemof simulation +- cluster popups +- url, view and calculations for result charts +- datapackage from digipipe +- models, layers and legend items from digipipe geodata + +### Changed +- legend layer colors and symbols +- static layer order +- paths for oemof hooks to digipipe scalars + +### Fixed +- units +- tour shows up after onboarding + ## [0.4.0] - 2023-06-20 ### Added - complete energy settings diff --git a/Makefile b/Makefile index 34169d28..02d8752d 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,9 @@ empty_data: empty_raster: python manage.py shell --command="from digiplan.utils import data_processing; data_processing.empty_raster()" +empty_simulations: + python manage.py shell --command="from django_oemof.models import Simulation; Simulation.objects.all().delete()" + distill: python manage.py distill-local --force --exclude-staticfiles ./digiplan/static/mvts diff --git a/README.md b/README.md index cf7b6a22..270d34e4 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,8 @@ Obviously, you have to clone this repo first. ## Prepare Data -In both cases, geometry packages have to be placed into folder _digiplan/data/_, +In both cases, the datapackage from digipipe have to be placed into folder _digiplan/data/_ and renamed into `digipipe`, so that they can be found by the application and uploaded into database. -All packages are justed dropped into this folder (no hierarchy). ## Using standard python installation @@ -260,3 +259,11 @@ Example to only load specific data: ``` docker-compose -f production.yml run --rm django python -u manage.py shell --command="from djagora.utils import load_overlays; from djagora.utils.load_configs import DYNAMIC_OVERLAYS; overlays = [item for item in DYNAMIC_OVERLAYS if item['name'].startswith('settlement')]; load_overlays.run(overlays=overlays)" ``` + +If celery does not complete, but shows no errors you can check redis for errors: + +```bash +docker exec -it bash +redis-cli keys "*" +redis-cli get +``` diff --git a/config/__init__.py b/config/__init__.py index 5568b6d7..87b6ced1 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -1,3 +1,4 @@ +"""Initializes celery automatically.""" # This will make sure the app is always imported when # Django starts so that shared_task will use this app. from .celery import app as celery_app diff --git a/config/celery.py b/config/celery.py index a7d32e65..e4549332 100644 --- a/config/celery.py +++ b/config/celery.py @@ -1,3 +1,4 @@ +"""Module to set up celery.""" import os from celery import Celery diff --git a/config/settings/__init__.py b/config/settings/__init__.py index e69de29b..e9b8c688 100644 --- a/config/settings/__init__.py +++ b/config/settings/__init__.py @@ -0,0 +1 @@ +"""Settings init.""" diff --git a/config/settings/base.py b/config/settings/base.py index 69383535..110aa92f 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -1,5 +1,7 @@ """Base settings to build other settings files upon.""" +import logging import os +import sys import environ from django.core.exceptions import ValidationError @@ -9,6 +11,8 @@ ROOT_DIR = environ.Path(__file__) - 3 # (digiplan/config/settings/base.py - 3 = digiplan/) APPS_DIR = ROOT_DIR.path("digiplan") DATA_DIR = APPS_DIR.path("data") +DIGIPIPE_DIR = DATA_DIR.path("digipipe") +DIGIPIPE_GEODATA_DIR = DIGIPIPE_DIR.path("geodata") METADATA_DIR = APPS_DIR.path("metadata") env = environ.Env() @@ -235,6 +239,22 @@ # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-result_backend CELERY_RESULT_BACKEND = CELERY_BROKER_URL +# test +TESTING = "test" in sys.argv[1:] +if TESTING: + logging.info("In TEST Mode - Disableling Migrations") + + class DisableMigrations: + """Disables migrations for test mode.""" + + def __contains__(self, item) -> bool: # noqa: D105, ANN001 + return True + + def __getitem__(self, item): # noqa: D105, ANN001, ANN204 + return None + + MIGRATION_MODULES = DisableMigrations() + # Your stuff... # ------------------------------------------------------------------------------ PASSWORD_PROTECTION = env.bool("PASSWORD_PROTECTION", False) @@ -260,6 +280,8 @@ setup.MapImage("hydro", "images/icons/map_hydro.png"), setup.MapImage("biomass", "images/icons/map_biomass.png"), setup.MapImage("combustion", "images/icons/map_combustion.png"), + setup.MapImage("gsgk", "images/icons/map_gsgk.png"), + setup.MapImage("storage", "images/icons/map_battery.png"), ] MAP_ENGINE_API_MVTS = { @@ -267,16 +289,58 @@ setup.MVTAPI("municipality", "map", "Municipality"), setup.MVTAPI("municipalitylabel", "map", "Municipality", "label_tiles"), ], + "static": [ + setup.MVTAPI("soil_quality_low", "map", "SoilQualityLow"), + setup.MVTAPI("soil_quality_high", "map", "SoilQualityHigh"), + setup.MVTAPI("landscape_protection_area", "map", "LandscapeProtectionArea"), + setup.MVTAPI("forest", "map", "Forest"), + setup.MVTAPI("special_protection_area", "map", "SpecialProtectionArea"), + setup.MVTAPI("air_traffic", "map", "AirTraffic"), + setup.MVTAPI("aviation", "map", "Aviation"), + setup.MVTAPI("biosphere_reserve", "map", "BiosphereReserve"), + setup.MVTAPI("drinking_water_protection_area", "map", "DrinkingWaterArea"), + setup.MVTAPI("fauna_flora_habitat", "map", "FaunaFloraHabitat"), + setup.MVTAPI("floodplain", "map", "Floodplain"), + setup.MVTAPI("grid", "map", "Grid"), + setup.MVTAPI("industry", "map", "Industry"), + setup.MVTAPI("less_favoured_areas_agricultural", "map", "LessFavouredAreasAgricultural"), + setup.MVTAPI("military", "map", "Military"), + setup.MVTAPI("nature_conservation_area", "map", "NatureConservationArea"), + setup.MVTAPI("railway", "map", "Railway"), + setup.MVTAPI("road_default", "map", "Road"), + setup.MVTAPI("road_railway-500m_region", "map", "RoadRailway500m"), + setup.MVTAPI("settlement-0m", "map", "Settlement0m"), + setup.MVTAPI("water", "map", "Water"), + ], + "potential": [ + setup.MVTAPI("potentialarea_pv_agriculture_lfa-off_region", "map", "PotentialareaPVAgricultureLFAOff"), + setup.MVTAPI("potentialarea_pv_road_railway_region", "map", "PotentialareaPVRoadRailway"), + setup.MVTAPI("potentialarea_wind_stp_2018_vreg", "map", "PotentialareaWindSTP2018Vreg"), + setup.MVTAPI("potentialarea_wind_stp_2027_repowering", "map", "PotentialareaWindSTP2027Repowering"), + setup.MVTAPI( + "potentialarea_wind_stp_2027_search_area_forest_area", + "map", + "PotentialareaWindSTP2027SearchAreaForestArea", + ), + setup.MVTAPI( + "potentialarea_wind_stp_2027_search_area_open_area", + "map", + "PotentialareaWindSTP2027SearchAreaOpenArea", + ), + setup.MVTAPI("potentialarea_wind_stp_2027_vr", "map", "PotentialareaWindSTP2027VR"), + ], "results": [setup.MVTAPI("results", "map", "Municipality")], } MAP_ENGINE_API_CLUSTERS = [ - setup.ClusterAPI("wind", "map", "WindTurbine"), - setup.ClusterAPI("pvroof", "map", "PVroof"), - setup.ClusterAPI("pvground", "map", "PVground"), - setup.ClusterAPI("hydro", "map", "Hydro"), - setup.ClusterAPI("biomass", "map", "Biomass"), - setup.ClusterAPI("combustion", "map", "Combustion"), + setup.ClusterAPI("wind", "map", "WindTurbine", properties=["id"]), + setup.ClusterAPI("pvroof", "map", "PVroof", properties=["id"]), + setup.ClusterAPI("pvground", "map", "PVground", properties=["id"]), + setup.ClusterAPI("hydro", "map", "Hydro", properties=["id"]), + setup.ClusterAPI("biomass", "map", "Biomass", properties=["id"]), + setup.ClusterAPI("combustion", "map", "Combustion", properties=["id"]), + setup.ClusterAPI("gsgk", "map", "GSGK", properties=["id"]), + setup.ClusterAPI("storage", "map", "Storage", properties=["id"]), ] MAP_ENGINE_STYLES_FOLDER = "digiplan/static/config/" @@ -285,28 +349,107 @@ } MAP_ENGINE_CHOROPLETHS = [ - setup.Choropleth("population", layers=["municipality"], title=_("Einwohner_innenzahl"), unit=_("EW")), - setup.Choropleth("population_density", layers=["municipality"], title=_("Einwohner_innenzahl"), unit=_("EW/qm")), - setup.Choropleth("capacity", layers=["municipality"], title=_("Installierte Leistung"), unit=_("MW")), + setup.Choropleth("population_statusquo", layers=["municipality"], title=_("Einwohner_innenzahl"), unit=_("")), setup.Choropleth( - "capacity_square", + "population_density_statusquo", + layers=["municipality"], + title=_("Einwohner_innenzahl pro km²"), + unit=_(""), + ), + setup.Choropleth("employees_statusquo", layers=["municipality"], title=_("Beschäftigte"), unit=_("")), + setup.Choropleth("companies_statusquo", layers=["municipality"], title=_("Betriebe"), unit=_("")), + setup.Choropleth("capacity_statusquo", layers=["municipality"], title=_("Installierte Leistung"), unit=_("MW")), + setup.Choropleth( + "capacity_square_statusquo", layers=["municipality"], title=_("Installierte Leistung pro qm"), - unit=_("MW/qm"), + unit=_("MW"), ), - setup.Choropleth("wind_turbines", layers=["municipality"], title=_("Anzahl Windturbinen"), unit=_("")), + setup.Choropleth("wind_turbines_statusquo", layers=["municipality"], title=_("Anzahl Windturbinen"), unit=_("")), setup.Choropleth( - "wind_turbines_square", + "wind_turbines_square_statusquo", layers=["municipality"], title=_("Anzahl Windturbinen pro qm"), unit=_(""), ), setup.Choropleth( - "renewable_electricity_production", + "energy_statusquo", + layers=["municipality"], + title=_("Energie Erneuerbare"), + unit=_("GWh"), + ), + setup.Choropleth( + "energy_2045", layers=["municipality"], title=_("Energie Erneuerbare"), unit=_("GWh"), ), + setup.Choropleth( + "energy_share_statusquo", + layers=["municipality"], + title=_("Anteil Erneuerbare Energien am Strombedarf"), + unit=_("%"), + ), + setup.Choropleth( + "energy_capita_statusquo", + layers=["municipality"], + title=_("Gewonnene Energie aus EE je EW"), + unit=_("MWh"), + ), + setup.Choropleth( + "energy_capita_2045", + layers=["municipality"], + title=_("Gewonnene Energie aus EE je EW"), + unit=_("MWh"), + ), + setup.Choropleth( + "energy_square_statusquo", + layers=["municipality"], + title=_("Gewonnene Energie aus EE je km²"), + unit=_("MWh"), + ), + setup.Choropleth( + "energy_square_2045", + layers=["municipality"], + title=_("Gewonnene Energie aus EE je km²"), + unit=_("MWh"), + ), + setup.Choropleth( + "electricity_demand_statusquo", + layers=["municipality"], + title=_("Strombedarf"), + unit=_("GWh"), + ), + setup.Choropleth( + "electricity_demand_capita_statusquo", + layers=["municipality"], + title=_("Strombedarf pro EinwohnerIn"), + unit=_("kWh"), + ), + setup.Choropleth( + "heat_demand_statusquo", + layers=["municipality"], + title=_("Wärmebedarf"), + unit=_("GWh"), + ), + setup.Choropleth( + "heat_demand_capita_statusquo", + layers=["municipality"], + title=_("Wärmebedarf pro EinwohnerIn"), + unit=_("kWh"), + ), + setup.Choropleth( + "batteries_statusquo", + layers=["municipality"], + title=_("Anzahl Batteriespeicher"), + unit=_("#"), + ), + setup.Choropleth( + "batteries_capacity_statusquo", + layers=["municipality"], + title=_("Kapazität Batteriespeicher"), + unit=_("MWh"), + ), ] MAP_ENGINE_POPUPS = [ @@ -314,13 +457,59 @@ "municipality", popup_at_default_layer=False, choropleths=[ - "population", - "population_density", - "capacity", - "capacity_square", - "wind_turbines", - "wind_turbines_square", - "renewable_electricity_production", + "population_statusquo", + "population_density_statusquo", + "employees_statusquo", + "companies_statusquo", + "capacity_statusquo", + "capacity_square_statusquo", + "wind_turbines_statusquo", + "wind_turbines_square_statusquo", + "energy_statusquo", + "energy_2045", + "energy_share_statusquo", + "energy_capita_statusquo", + "energy_capita_2045", + "energy_square_statusquo", + "energy_square_2045", + "electricity_demand_statusquo", + "electricity_demand_capita_statusquo", + "heat_demand_statusquo", + "heat_demand_capita_statusquo", + "batteries_statusquo", + "batteries_capacity_statusquo", ], ), + setup.Popup( + "wind", + popup_at_default_layer=True, + ), + setup.Popup( + "pvground", + popup_at_default_layer=True, + ), + setup.Popup( + "pvroof", + popup_at_default_layer=True, + ), + setup.Popup( + "hydro", + popup_at_default_layer=True, + ), + setup.Popup( + "biomass", + popup_at_default_layer=True, + ), + setup.Popup( + "combustion", + popup_at_default_layer=True, + ), + setup.Popup( + "gsgk", + popup_at_default_layer=True, + ), + setup.Popup( + "storage", + popup_at_default_layer=True, + ), ] diff --git a/digiplan/__init__.py b/digiplan/__init__.py index d9127a1c..94761f7d 100644 --- a/digiplan/__init__.py +++ b/digiplan/__init__.py @@ -1,4 +1,4 @@ """Digiplan init - holds current version.""" -__version__ = "0.4.0" +__version__ = "0.5.0" __version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace("-", ".", 1).split(".")]) diff --git a/digiplan/conftest.py b/digiplan/conftest.py index 0910280e..9a35154f 100644 --- a/digiplan/conftest.py +++ b/digiplan/conftest.py @@ -1,12 +1 @@ -import pytest -from django.test import RequestFactory - - -@pytest.fixture(autouse=True) -def media_storage(settings, tmpdir): - settings.MEDIA_ROOT = tmpdir.strpath - - -@pytest.fixture -def request_factory() -> RequestFactory: - return RequestFactory() +"""Module guarantees that pytest finds root directory.""" diff --git a/digiplan/data/README.md b/digiplan/data/README.md index 0e1c793a..d1e87e2b 100644 --- a/digiplan/data/README.md +++ b/digiplan/data/README.md @@ -1 +1,3 @@ - In this folder, all geopackages are stored. +Data folder must contain following folders: +- digipipe: datapackage from digipipe holding data and geodata +- oemof: holding ES datapackage from `oemof.tabular` diff --git a/digiplan/data/scenarios/.gitkeep b/digiplan/data/scenarios/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/digiplan/data/scenarios/README.md b/digiplan/data/scenarios/README.md deleted file mode 100644 index 744d980f..00000000 --- a/digiplan/data/scenarios/README.md +++ /dev/null @@ -1,11 +0,0 @@ -In this folder, scenario data for StatusQuo and Sceanrio2045 are stored. -Those values are read in while simulating energysystem with oemof -and for calculating results and plotting charts. - -## Electricity demand: - -https://github.com/rl-institut-private/digiplan/issues/231 - -For compatibility with oemof datapackage: -- rename _demand_cts_power_demand.csv_ into _demand_ghd_power_demand.csv_ -- rename _demand_ind_power_demand.csv_ into _demand_i_power_demand.csv_ diff --git a/digiplan/map/__init__.py b/digiplan/map/__init__.py index e69de29b..2d43f75a 100644 --- a/digiplan/map/__init__.py +++ b/digiplan/map/__init__.py @@ -0,0 +1 @@ +"""Map init.""" diff --git a/digiplan/map/apps.py b/digiplan/map/apps.py index e62ed130..0f447636 100644 --- a/digiplan/map/apps.py +++ b/digiplan/map/apps.py @@ -32,10 +32,10 @@ def ready(self) -> None: hooks.register_hook( hooks.HookType.PARAMETER, - hooks.Hook(scenario=hooks.ALL_SCENARIOS, function=digiplan_hooks.adapt_heat_demand), + hooks.Hook(scenario=hooks.ALL_SCENARIOS, function=digiplan_hooks.adapt_heat_settings), ) hooks.register_hook( hooks.HookType.PARAMETER, - hooks.Hook(scenario=hooks.ALL_SCENARIOS, function=digiplan_hooks.adapt_capacities), + hooks.Hook(scenario=hooks.ALL_SCENARIOS, function=digiplan_hooks.adapt_renewable_capacities), ) diff --git a/digiplan/map/calculations.py b/digiplan/map/calculations.py index 851bc2a2..32a09303 100644 --- a/digiplan/map/calculations.py +++ b/digiplan/map/calculations.py @@ -1,167 +1,247 @@ """Module for calculations used for choropleths or charts.""" -from typing import Optional - import pandas as pd +from django.conf import settings from django.db.models import Sum +from django.utils.translation import gettext_lazy as _ +from django_oemof.models import Simulation from django_oemof.results import get_results from oemof.tabular.postprocessing import calculations, core -from digiplan.map import config, models +from digiplan.map import config, datapackage, models -def calculate_square_for_value(value: int, municipality_id: Optional[int]) -> float: +def calculate_square_for_value(df: pd.DataFrame) -> pd.DataFrame: """ - Calculate value related to municipality area. + Calculate values related to municipality areas. Parameters ---------- - value: int - Value to calculate - municipality_id: Optional[int] - ID of municipality to get area from - If not given, value in relation to area of whole region is calculated. + df: pd.DataFrame + Index holds municipality IDs, columns hold random entries Returns ------- - float - Value per square meter + pd.DataFrame + Each value is multiplied by related municipality share """ - area = 0.0 - if municipality_id is not None: - area = models.Municipality.objects.get(pk=municipality_id).area - else: - for mun in models.Municipality.objects.all(): - area += models.Municipality.objects.get(pk=mun.id).area - if area != 0.0: # noqa: PLR2004 - return value / area - return value + is_series = False + if isinstance(df, pd.Series): + is_series = True + df = pd.DataFrame(df) # noqa: PD901 + areas = ( + pd.DataFrame.from_records(models.Municipality.objects.all().values("id", "area")).set_index("id").sort_index() + ) + result = df / areas.sum().sum() if len(df) == 1 else df.sort_index() / areas.to_numpy() + if is_series: + return result.iloc[:, 0] + return result + + +def value_per_municipality(series: pd.Series) -> pd.DataFrame: + """Shares values across areas (dummy function).""" + data = pd.concat([series] * 20, axis=1).transpose() + data.index = range(20) + areas = ( + pd.DataFrame.from_records(models.Municipality.objects.all().values("id", "area")).set_index("id").sort_index() + ) + result = data.sort_index() / areas.to_numpy() + return result / areas.sum().sum() -def capacity(mun_id: Optional[int] = None) -> float: +def calculate_capita_for_value(df: pd.DataFrame) -> pd.DataFrame: """ - Calculate capacity of renewables (either for municipality or for whole region). + Calculate values related to population. If only one region is given, whole region is assumed. Parameters ---------- - mun_id: Optional[int] - If given, capacity of renewables for given municipality are calculated. If not, for whole region. + df: pd.DataFrame + Index holds municipality IDs, columns hold random entries Returns ------- - float - Sum of installed renewables + pd.DataFrame + Each value is multiplied by related municipality population share """ - capacity = 0.0 - values = capacity_per_municipality() + is_series = False + if isinstance(df, pd.Series): + is_series = True + df = pd.DataFrame(df) # noqa: PD901 + + population = ( + pd.DataFrame.from_records(models.Population.objects.filter(year=2022).values("id", "value")) + .set_index("id") + .sort_index() + ) + result = df / population.sum().sum() if len(df) == 1 else df.sort_index() / population.to_numpy() + if is_series: + return result.iloc[:, 0] + return result + + +def employment_per_municipality() -> pd.DataFrame: + """Return employees per municipality.""" + return datapackage.get_employment()["employees_total"] + + +def companies_per_municipality() -> pd.DataFrame: + """Return companies per municipality.""" + return datapackage.get_employment()["companies_total"] - if mun_id is not None: - capacity = values[mun_id] - else: - for _key, value in values.items(): - capacity += value - return capacity +def batteries_per_municipality() -> pd.DataFrame: + """Return battery count per municipality.""" + return datapackage.get_batteries()["count"] -# pylint: disable=W0613 -def capacity_comparison(municipality_id: int) -> dict: # noqa: ARG001 + +def battery_capacities_per_municipality() -> pd.DataFrame: + """Return battery capacity per municipality.""" + return datapackage.get_batteries()["storage_capacity"] + + +def capacities_per_municipality() -> pd.DataFrame: """ - Get chart for capacity of renewables. + Calculate capacity of renewables per municipality in MW. - Parameters - ---------- - municipality_id: int - Related municipality + Returns + ------- + pd.DataFrame + Capacity per municipality (index) and technology (column) + """ + capacities = [] + for technology in ( + models.WindTurbine, + models.PVroof, + models.PVground, + models.Hydro, + models.Biomass, + models.Storage, + ): + res_capacity = pd.DataFrame.from_records( + technology.objects.values("mun_id").annotate(capacity=Sum("capacity_net")).values("mun_id", "capacity"), + ).set_index("mun_id") + res_capacity.columns = [technology._meta.verbose_name] # noqa: SLF001 + capacities.append(res_capacity) + return pd.concat(capacities, axis=1).fillna(0.0) * 1e-3 + + +def energies_per_municipality() -> pd.DataFrame: + """ + Calculate energy of renewables per municipality in GWh. Returns ------- - dict - Chart data to use in JS + pd.DataFrame + Energy per municipality (index) and technology (column) """ - return ([3600, 1000], [200, 100], [500, 1000], [300, 1000], [1700, 1000]) + capacities = capacities_per_municipality() + full_load_hours = pd.Series( + data=[technology_data["2022"] for technology_data in config.TECHNOLOGY_DATA["full_load_hours"].values()], + index=config.TECHNOLOGY_DATA["full_load_hours"].keys(), + ) + full_load_hours = full_load_hours.reindex(index=["wind", "pv_roof", "pv_ground", "ror", "bioenergy", "st"]) + return capacities * full_load_hours.values / 1e3 -def capacity_per_municipality() -> dict[int, int]: +def energies_per_municipality_2045(simulation_id: int) -> pd.DataFrame: + """Calculate energies from 2045 scenario per municipality.""" + results = get_results( + simulation_id, + { + "electricity_production": electricity_production, + }, + ) + renewables = results["electricity_production"][ + results["electricity_production"].index.get_level_values(0).isin(config.SIMULATION_RENEWABLES) + ] + renewables.index = ["hydro", "pv_ground", "pv_roof", "wind"] + renewables = renewables.reindex(["wind", "pv_roof", "pv_ground", "hydro"]) + + parameters = Simulation.objects.get(pk=simulation_id).parameters + renewables = renewables * calculate_potential_shares(parameters) + renewables["bioenergy"] = 0.0 + renewables["st"] = 0.0 + return renewables + + +def energy_shares_per_municipality() -> pd.DataFrame: """ - Calculate capacity of renewables per municipality. + Calculate energy shares of renewables from electric demand per municipality. Returns ------- - dict[int, int] - Capacity per municipality - """ - capacity = {} - municipalities = models.Municipality.objects.all() - - for mun in municipalities: - res_capacity = 0.0 - for renewable in models.RENEWABLES: - one_capacity = renewable.objects.filter(mun_id__exact=mun.id).aggregate(Sum("capacity_net"))[ - "capacity_net__sum" - ] - if one_capacity is None: - one_capacity = 0.0 - res_capacity += one_capacity - capacity[mun.id] = res_capacity - return capacity - - -def capacity_square(mun_id: Optional[int] = None) -> float: + pd.DataFrame + Energy share per municipality (index) and technology (column) """ - Calculate capacity of renewables per km² (either for municipality or for whole region). + energies = energies_per_municipality() + demands = datapackage.get_power_demand() + total_demand = pd.concat([d["2022"] for d in demands.values()], axis=1).sum(axis=1) + total_demand_share = total_demand / total_demand.sum() + energies = energies.reindex(range(20)) + return energies.mul(total_demand_share, axis=0) - Parameters - ---------- - mun_id: Optional[int] - If given, capacity of renewables per km² for given municipality are calculated. If not, for whole region. + +def electricity_demand_per_municipality() -> pd.DataFrame: + """ + Calculate electricity demand per sector per municipality in GWh. Returns ------- - float - Sum of installed renewables + pd.DataFrame + Electricity demand per municipality (index) and sector (column) """ - value = capacity(mun_id) - return calculate_square_for_value(value, mun_id) + demands_raw = datapackage.get_power_demand() + demands_per_sector = pd.concat([demand["2022"] for demand in demands_raw.values()], axis=1) + demands_per_sector.columns = [ + _("Electricity Household Demand"), + _("Electricity CTS Demand"), + _("Electricity Industry Demand"), + ] + return demands_per_sector * 1e-3 -# pylint: disable=W0613 -def capacity_square_comparison(municipality_id: int) -> dict: +def heat_demand_per_municipality() -> pd.DataFrame: """ - Get chart for capacity of renewables per km². - - Parameters - ---------- - municipality_id: int - Related municipality + Calculate heat demand per sector per municipality in GWh. Returns ------- - dict - Chart data to use in JS + pd.DataFrame + Heat demand per municipality (index) and sector (column) """ - capacity_square = [] - capacity = capacity_comparison(municipality_id) - for quo, future in capacity: - quo_new = calculate_square_for_value(quo, municipality_id) - future_new = calculate_square_for_value(future, municipality_id) - capacity_square.append([quo_new, future_new]) - - return capacity_square + demands_raw = datapackage.get_summed_heat_demand_per_municipality() + demands_per_sector = pd.concat( + [distributions["cen"]["2022"] + distributions["dec"]["2022"] for distributions in demands_raw.values()], + axis=1, + ) + demands_per_sector.columns = [ + _("Electricity Household Demand"), + _("Electricity CTS Demand"), + _("Electricity Industry Demand"), + ] + return demands_per_sector * 1e-3 -def capacity_square_per_municipality() -> dict[int, int]: +def detailed_overview(simulation_id: int) -> pd.DataFrame: # noqa: ARG001 """ - Calculate capacity of renewables per km² per municipality. + Calculate data for detailed overview chart from simulation ID. + + Parameters + ---------- + simulation_id: int + Simulation ID to calculate results from Returns ------- - dict[int, int] - Capacity per km² per municipality + pandas.DataFrame + holding data for detailed overview chart """ - capacity = capacity_per_municipality() - for key, value in capacity.items(): - capacity[key] = calculate_square_for_value(value, key) - return capacity + # TODO(Hendrik): Calculate real data + # https://github.com/rl-institut-private/digiplan/issues/164 + return pd.DataFrame( + data={"production": [300, 200, 200, 150, 520, 0], "consumption": [0, 0, 0, 0, 0, 1300]}, + index=["wind", "pv_roof", "pv_ground", "biomass", "fossil", "consumption"], + ) def electricity_from_from_biomass(simulation_id: int) -> pd.Series: @@ -278,6 +358,91 @@ def electricity_heat_demand(simulation_id: int) -> pd.Series: return electricity_for_heat_sum +def calculate_potential_shares(parameters: dict) -> pd.DataFrame: + """Calculate potential shares depending on user settings.""" + # DISAGGREGATION + # Wind + wind_areas = pd.read_csv( + settings.DIGIPIPE_DIR.path("scalars").path("potentialarea_wind_area_stats_muns.csv"), + index_col=0, + ) + if parameters["s_w_3"]: + wind_area_per_mun = wind_areas["stp_2018_vreg"] + elif parameters["s_w_4_1"]: + wind_area_per_mun = wind_areas["stp_2027_vr"] + elif parameters["s_w_4_2"]: + wind_area_per_mun = wind_areas["stp_2027_repowering"] + elif parameters["s_w_5"]: + wind_area_per_mun = ( + wind_areas["stp_2027_search_area_open_area"] * parameters["s_w_5_1"] / 100 + + wind_areas["stp_2027_search_area_forest_area"] * parameters["s_w_5_2"] / 100 + ) + else: + msg = "No wind switch set" + raise KeyError(msg) + wind_share_per_mun = wind_area_per_mun / wind_area_per_mun.sum() + + # PV ground + pv_ground_areas = pd.read_csv( + settings.DIGIPIPE_DIR.path("scalars").path("potentialarea_pv_ground_area_stats_muns.csv", index_col=0), + ) + pv_ground_area_per_mun = ( + pv_ground_areas["agriculture_lfa-off_region"] * parameters["s_pv_ff_3"] / 100 + + pv_ground_areas["road_railway_region"] * parameters["s_pv_ff_4"] / 100 + ) + pv_ground_share_per_mun = pv_ground_area_per_mun / pv_ground_area_per_mun.sum() + + # PV roof + pv_roof_areas = pd.read_csv( + settings.DIGIPIPE_DIR.path("scalars").path("potentialarea_pv_roof_area_stats_muns.csv"), + index_col=0, + ) + pv_roof_area_per_mun = pv_roof_areas["installable_power_total"] + pv_roof_share_per_mun = pv_roof_area_per_mun / pv_roof_area_per_mun.sum() + + # Hydro + hydro_areas = pd.read_csv( + settings.DIGIPIPE_DIR.path("scalars").path("bnetza_mastr_hydro_stats_muns.csv"), + index_col=0, + ) + hydro_area_per_mun = hydro_areas["capacity_net"] + hydro_share_per_mun = hydro_area_per_mun / hydro_area_per_mun.sum() + + shares = pd.concat( + [wind_share_per_mun, pv_roof_share_per_mun, pv_ground_share_per_mun, hydro_share_per_mun], + axis=1, + ) + shares.columns = ["wind", "pv_roof", "pv_ground", "hydro"] + return shares + + +def capacities_per_municipality_2045(simulation_id: int) -> pd.DataFrame: + """ + Return capacities per municipality. + + Parameters + ---------- + simulation_id: int + Simulation ID to get results from + + Returns + ------- + pd.DataFrame + containing renewable capacities disaggregated per municipality + """ + results = get_results(simulation_id, {"electricity_production": electricity_production}) + renewables = results["electricity_production"][ + results["electricity_production"].index.get_level_values(0).isin(config.SIMULATION_RENEWABLES) + ] + renewables.index = renewables.index.get_level_values(0) + + parameters = Simulation.objects.get(pk=simulation_id).parameters + potential_shares = calculate_potential_shares(parameters) + renewable_shares = potential_shares * renewables.values + renewable_shares.columns = renewables.index + return renewable_shares.fillna(0.0) + + def electricity_overview(simulation_id: int) -> pd.Series: """ Return data for electricity overview chart. diff --git a/digiplan/map/charts.py b/digiplan/map/charts.py index 434816c9..82198553 100644 --- a/digiplan/map/charts.py +++ b/digiplan/map/charts.py @@ -2,111 +2,856 @@ import json import pathlib -from collections.abc import Callable, Iterable -from typing import Optional +from typing import Any, Optional -from digiplan.map import config, models +import pandas as pd +from django.utils.translation import gettext_lazy as _ -CHARTS: dict[str, Callable] = { - "wind_turbines": models.WindTurbine.wind_turbines_history, - "wind_turbines_square": models.WindTurbine.wind_turbines_per_area_history, -} +from digiplan.map import calculations, config, models +from digiplan.map.utils import merge_dicts -def get_chart_options(lookup: str) -> dict: - """ - Get the options for a chart from the corresponding json file. - - Parameters - ---------- - lookup: str - Looks up related chart function in CHARTS - - Returns - ------- - dict - Containing the json that can be filled with data - - Raises - ------ - LookupError - if lookup can't be found in LOOKUPS - """ - lookup_path = pathlib.Path(config.CHARTS_DIR.path(f"{lookup}.json")) - if not lookup_path.exists(): - error_msg = f"Could not find {lookup=} in charts folder." - raise LookupError(error_msg) +class Chart: + """Base class for charts.""" - with lookup_path.open("r", encoding="utf-8") as lookup_json: - lookup_options = json.load(lookup_json) + lookup: str = None - with pathlib.Path(config.CHARTS_DIR.path("general_options.json")).open("r", encoding="utf-8") as general_chart_json: - general_chart_options = json.load(general_chart_json) + def __init__( + self, + lookup: Optional[str] = None, + chart_data: Optional[Any] = None, + **kwargs, # noqa: ARG002 + ) -> None: + """Initialize chart data and chart options.""" + if lookup: + self.lookup = lookup + self.chart_data = chart_data if chart_data is not None else self.get_chart_data() + self.chart_options = self.get_chart_options() - chart = merge_dicts(general_chart_options, lookup_options) + def render(self) -> dict: + """ + Create chart based on given lookup and municipality ID or result option. - return chart + Returns + ------- + dict + Containing chart filled with data + """ + if self.chart_data is not None: + series_type = self.chart_options["series"][0]["type"] + series_length = len(self.chart_options["series"]) + if series_type == "line": + data = [] + for key, value in self.chart_data.items(): + year_as_string = f"{key}" + data.append([year_as_string, value]) + self.chart_options["series"][0]["data"] = data + elif series_length > 1: + for i in range(0, series_length): + values = self.chart_data[i] + if not isinstance(values, (list, tuple)): + values = [values] + self.chart_options["series"][i]["data"] = values + else: + self.chart_options["series"][0]["data"] = self.chart_data -def create_chart(lookup: str, chart_data: Optional[Iterable[tuple[str, float]]] = None) -> dict: - """ - Create chart based on given lookup and municipality ID or result option. + return self.chart_options - Parameters - ---------- - lookup: str - Looks up related chart function in charts folder. - chart_data: list[tuple[str, float]] - Chart data separated into tuples holding key and value - If no data is given, data is expected to be set via lookup JSON + def get_chart_options(self) -> dict: + """ + Get the options for a chart from the corresponding json file. - Returns - ------- - dict - Containing chart filled with data + Returns + ------- + dict + Containing the json that can be filled with data + Raises + ------ + LookupError + if lookup can't be found in LOOKUPS + """ + lookup_path = pathlib.Path(config.CHARTS_DIR.path(f"{self.lookup}.json")) + if not lookup_path.exists(): + error_msg = f"Could not find lookup '{self.lookup}' in charts folder." + raise LookupError(error_msg) + + with lookup_path.open("r", encoding="utf-8") as lookup_json: + lookup_options = json.load(lookup_json) + + with pathlib.Path(config.CHARTS_DIR.path("general_options.json")).open( + "r", + encoding="utf-8", + ) as general_chart_json: + general_chart_options = json.load(general_chart_json) + + options = merge_dicts(general_chart_options, lookup_options) + return options + + def get_chart_data(self) -> None: + """ + Check if chart_data_function is valid. + + Returns + ------- + None + + """ + return + + +class SimulationChart(Chart): + """For charts based on simulations.""" + + def __init__(self, simulation_id: int) -> None: + """ + Init Detailed Overview Chart. + + Parameters + ---------- + simulation_id: any + id of used Simulation + """ + self.simulation_id = simulation_id + super().__init__() + + +class DetailedOverviewChart(Chart): + """Detailed Overview Chart.""" + + lookup = "detailed_overview" + + def __init__(self, simulation_id: int) -> None: + """ + Init Detailed Overview Chart. + + Parameters + ---------- + simulation_id: any + id of used Simulation + """ + self.simulation_id = simulation_id + super().__init__() + + def get_chart_data(self): # noqa: D102, ANN201 + return calculations.detailed_overview(simulation_id=self.simulation_id) + + def render(self) -> dict: # noqa: D102 + for item in self.chart_options["series"]: + profile = config.SIMULATION_NAME_MAPPING[item["name"]] + item["data"][1] = self.chart_data[profile] + + return self.chart_options + + +class CTSOverviewChart(Chart): + """CTS Overview Chart. Shows greenhouse gas emissions.""" + + lookup = "ghg_overview" + + def __init__(self, simulation_id: int) -> None: + """ + Init CTS Overview Chart. + + Parameters + ---------- + simulation_id: any + id of used Simulation + """ + self.simulation_id = simulation_id + super().__init__() + + def get_chart_data(self): # noqa: D102, ANN201 + return calculations.detailed_overview(simulation_id=self.simulation_id) + + def render(self) -> dict: # noqa: D102 + for item in self.chart_options["series"]: + profile = config.SIMULATION_NAME_MAPPING[item["name"]] + item["data"][2] = self.chart_data[profile] + + return self.chart_options + + +class ElectricityOverviewChart(Chart): + """Chart for electricity overview.""" + + lookup = "electricity_overview" + + def __init__(self, simulation_id: int) -> None: + """Store simulation ID.""" + self.simulation_id = simulation_id + super().__init__() + + def get_chart_data(self): # noqa: ANN201 + """Get chart data from electricity overview calculation.""" + return calculations.electricity_overview(simulation_id=self.simulation_id) + + def render(self) -> dict: + """Overwrite render function.""" + self.chart_options["series"][0]["data"][2] = self.chart_data["ABW-wind-onshore"] + self.chart_options["series"][1]["data"][2] = self.chart_data["ABW-solar-pv_ground"] + self.chart_options["series"][2]["data"][2] = self.chart_data["ABW-solar-pv_rooftop"] + self.chart_options["series"][3]["data"][2] = self.chart_data["ABW-biomass"] + self.chart_options["series"][4]["data"][2] = self.chart_data["ABW-hydro-ror"] + self.chart_options["series"][5]["data"][0] = self.chart_data["ABW-electricity-demand_cts"] + self.chart_options["series"][6]["data"][0] = self.chart_data["electricity_heat_demand_cts"] + self.chart_options["series"][7]["data"][0] = self.chart_data["ABW-electricity-demand_hh"] + self.chart_options["series"][8]["data"][0] = self.chart_data["electricity_heat_demand_hh"] + self.chart_options["series"][9]["data"][0] = self.chart_data["ABW-electricity-demand_ind"] + self.chart_options["series"][10]["data"][0] = self.chart_data["electricity_heat_demand_ind"] + self.chart_options["series"][11]["data"][0] = self.chart_data["ABW-electricity-bev_charging"] + return self.chart_options + + +class ElectricityCTSChart(Chart): + """Electricity CTS Chart. Shows greenhouse gas emissions.""" + + lookup = "electricity_ghg" + + def __init__(self, simulation_id: int) -> None: + """ + Init Electricity CTS Chart. + + Parameters + ---------- + simulation_id: any + id of used Simulation + """ + self.simulation_id = simulation_id + super().__init__() + + def get_chart_data(self): # noqa: D102, ANN201 + return calculations.detailed_overview(simulation_id=self.simulation_id) + + def render(self) -> dict: # noqa: D102 + for item in self.chart_options["series"]: + profile = config.SIMULATION_NAME_MAPPING[item["name"]] + item["data"][2] = self.chart_data[profile] + + return self.chart_options + + +class HeatOverviewChart(Chart): + """Heat Overview Chart.""" + + lookup = "overview_heat" + + def __init__(self, simulation_id: int) -> None: + """ + Init Heat Overview Chart. + + Parameters + ---------- + simulation_id: any + id of used Simulation + """ + self.simulation_id = simulation_id + super().__init__() + + def get_chart_data(self): # noqa: D102, ANN201 + return calculations.heat_overview(simulation_id=self.simulation_id) + + def render(self) -> dict: # noqa: D102 + for item in self.chart_options["series"]: + profile = config.SIMULATION_NAME_MAPPING[item["name"]] + item["data"][1] = self.chart_data[profile] + + return self.chart_options + + +class HeatProductionChart(Chart): + """Heat Production Chart. Shows decentralized and centralized heat.""" + + lookup = "decentralized_centralized_heat" + + def __init__(self, simulation_id: int) -> None: + """ + Init Heat Production Chart. + + Parameters + ---------- + simulation_id: any + id of used Simulation + """ + self.simulation_id = simulation_id + super().__init__() + + def get_chart_data(self): # noqa: D102, ANN201 + return calculations.heat_overview(simulation_id=self.simulation_id) + + def render(self) -> dict: # noqa: D102 + for item in self.chart_options["series"]: + profile = config.SIMULATION_NAME_MAPPING[item["name"]] + item["data"][1] = self.chart_data[profile] + + return self.chart_options + + +class MobilityOverviewChart(Chart): + """Mobility Overview Chart. Shows Number of Cars.""" + + lookup = "mobility_overview" + + def __init__(self, simulation_id: int) -> None: + """ + Init Mobility Overview Chart. + + Parameters + ---------- + simulation_id: any + id of used Simulation + """ + self.simulation_id = simulation_id + super().__init__() + + def get_chart_data(self): # noqa: D102, ANN201 + return calculations.heat_overview(simulation_id=self.simulation_id) + + def render(self) -> dict: # noqa: D102 + for item in self.chart_options["series"]: + profile = config.SIMULATION_NAME_MAPPING[item["name"]] + item["data"][1] = self.chart_data[profile] + + return self.chart_options + + +class MobilityCTSChart(Chart): + """Mobility CTS Chart. Shows greenhouse gas emissions.""" + + lookup = "mobility_ghg" + + def __init__(self, simulation_id: int) -> None: + """ + Init Mobility CTS Chart. + + Parameters + ---------- + simulation_id: any + id of used Simulation + """ + self.simulation_id = simulation_id + super().__init__() + + def get_chart_data(self): # noqa: D102, ANN201 + return calculations.detailed_overview(simulation_id=self.simulation_id) + + def render(self) -> dict: # noqa: D102 + for item in self.chart_options["series"]: + profile = config.SIMULATION_NAME_MAPPING[item["name"]] + item["data"][2] = self.chart_data[profile] + + return self.chart_options + + +class GhgHistoryChart(Chart): + """GHG history chart.""" + + lookup = "ghg_history" + + def __init__(self, simulation_id: int) -> None: + """ + Init GHG history chart. + + Parameters + ---------- + simulation_id: any + id of used Simulation + """ + self.simulation_id = simulation_id + super().__init__() + + def get_chart_data(self): # noqa: D102, ANN201 + # TODO(Hendrik): Get static data from digipipe datapackage # noqa: TD003 + return pd.DataFrame() + + def render(self) -> dict: # noqa: D102 + for item in self.chart_options["series"]: + profile = config.SIMULATION_NAME_MAPPING[item["name"]] + item["data"][1] = self.chart_data[profile] + + return self.chart_options + + +class GhgReductionChart(Chart): + """GHG reduction chart.""" + + lookup = "ghg_reduction" + + def __init__(self, simulation_id: int) -> None: + """ + Init GHG reduction chart. + + Parameters + ---------- + simulation_id: any + id of used Simulation + """ + self.simulation_id = simulation_id + super().__init__() + + def get_chart_data(self): # noqa: D102, ANN201 + # TODO(Hendrik): Get static data (1st column) from # noqa: TD003 + # digipipe datapackage + # and calc reductions for 2nd column. TD003 + return pd.DataFrame() + + def render(self) -> dict: # noqa: D102 + for item in self.chart_options["series"]: + profile = config.SIMULATION_NAME_MAPPING[item["name"]] + item["data"][1] = self.chart_data[profile] + + return self.chart_options + + +class GhgHistoryChart(Chart): + """GHG history chart.""" + + lookup = "ghg_history" + + def __init__(self, simulation_id: int) -> None: + """ + Init GHG history chart. + + Parameters + ---------- + simulation_id: any + id of used Simulation + """ + self.simulation_id = simulation_id + super().__init__() + + def get_chart_data(self): # noqa: D102, ANN201 + # TODO(Hendrik): Get static data from digipipe datapackage # noqa: TD003 + return pd.DataFrame() + + def render(self) -> dict: # noqa: D102 + for item in self.chart_options["series"]: + profile = config.SIMULATION_NAME_MAPPING[item["name"]] + item["data"][1] = self.chart_data[profile] + + return self.chart_options + + +class GhgReductionChart(Chart): + """GHG reduction chart.""" + + lookup = "ghg_reduction" + + def __init__(self, simulation_id: int) -> None: + """ + Init GHG reduction chart. + + Parameters + ---------- + simulation_id: any + id of used Simulation + """ + self.simulation_id = simulation_id + super().__init__() + + def get_chart_data(self): # noqa: D102, ANN201 + # TODO(Hendrik): Get static data (1st column) from # noqa: TD003 + # digipipe datapackage + # and calc reductions for 2nd column. TD003 + return pd.DataFrame() + + def render(self) -> dict: # noqa: D102 + for item in self.chart_options["series"]: + profile = config.SIMULATION_NAME_MAPPING[item["name"]] + item["data"][1] = self.chart_data[profile] + + return self.chart_options + + +class PopulationRegionChart(Chart): + """Chart for regional population.""" + + lookup = "population" + + def get_chart_data(self) -> None: + """Calculate population for whole region.""" + return models.Population.quantity_per_municipality_per_year().sum() + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + return chart_options + + +class PopulationDensityRegionChart(Chart): + """Chart for regional population density.""" + + lookup = "population" + + def get_chart_data(self) -> None: + """Calculate capacities for whole region.""" + return calculations.calculate_square_for_value( + pd.DataFrame(models.Population.quantity_per_municipality_per_year().sum()).transpose(), + ).sum() + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + chart_options["yAxis"]["name"] = _("EW/km²") + return chart_options + + +class EmployeesRegionChart(Chart): + """Chart for regional employees.""" + + lookup = "wind_turbines" + + def get_chart_data(self) -> list: + """Calculate population for whole region.""" + return [int(calculations.employment_per_municipality().sum())] + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + chart_options["yAxis"]["name"] = _("") + del chart_options["series"][0]["name"] + return chart_options + + +class CompaniesRegionChart(Chart): + """Chart for regional companies.""" + + lookup = "wind_turbines" + + def get_chart_data(self) -> list: + """Calculate population for whole region.""" + return [int(calculations.companies_per_municipality().sum())] + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + chart_options["yAxis"]["name"] = _("") + del chart_options["series"][0]["name"] + return chart_options + + +class CapacityRegionChart(Chart): + """Chart for regional capacities.""" + + lookup = "capacity" + + def get_chart_data(self) -> None: + """Calculate capacities for whole region.""" + return calculations.capacities_per_municipality().sum() + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + return chart_options + + +class CapacitySquareRegionChart(Chart): + """Chart for regional capacities per square meter.""" + + lookup = "capacity" + + def get_chart_data(self) -> None: + """Calculate capacities for whole region.""" + return calculations.calculate_square_for_value( + pd.DataFrame(calculations.capacities_per_municipality().sum()).transpose(), + ).sum() + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + chart_options["yAxis"]["name"] = _("MW") + return chart_options + + +class EnergyRegionChart(Chart): + """Chart for regional energy.""" + + lookup = "capacity" + + def get_chart_data(self) -> None: + """Calculate capacities for whole region.""" + return calculations.energies_per_municipality().sum() + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + chart_options["yAxis"]["name"] = _("GWh") + return chart_options + + +class Energy2045RegionChart(SimulationChart): + """Chart for regional energy.""" + + lookup = "capacity" + + def get_chart_data(self) -> None: + """Calculate capacities for whole region.""" + status_quo_data = calculations.energies_per_municipality().sum() + future_data = calculations.energies_per_municipality_2045(self.simulation_id).sum() + return list(zip(status_quo_data, future_data)) + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + chart_options["yAxis"]["name"] = _("MWh") + chart_options["xAxis"]["data"] = ["Status Quo", "Mein Szenario"] + return chart_options + + +class EnergyShareRegionChart(Chart): + """Chart for regional energy shares.""" + + lookup = "capacity" + + def get_chart_data(self) -> None: + """Calculate capacities for whole region.""" + return calculations.energy_shares_per_municipality().sum() + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + chart_options["yAxis"]["name"] = _("%") + return chart_options + + +class EnergyCapitaRegionChart(Chart): + """Chart for regional energy shares per capita.""" + + lookup = "capacity" + + def get_chart_data(self) -> None: + """Calculate capacities for whole region.""" + return ( + calculations.calculate_capita_for_value( + pd.DataFrame(calculations.energies_per_municipality().sum()).transpose(), + ).sum() + * 1e3 + ) + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + chart_options["yAxis"]["name"] = _("MWh") + return chart_options + + +class EnergySquareRegionChart(Chart): + """Chart for regional energy shares per square meter.""" + + lookup = "capacity" + + def get_chart_data(self) -> None: + """Calculate capacities for whole region.""" + return ( + calculations.calculate_square_for_value( + pd.DataFrame(calculations.energies_per_municipality().sum()).transpose(), + ).sum() + * 1e3 + ) + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + chart_options["yAxis"]["name"] = _("MWh") + return chart_options + + +class WindTurbinesRegionChart(Chart): + """Chart for regional wind turbines.""" + + lookup = "wind_turbines" + + def get_chart_data(self) -> list[int]: + """Calculate population for whole region.""" + return [int(models.WindTurbine.quantity_per_municipality().sum())] + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + return chart_options + + +class WindTurbinesSquareRegionChart(Chart): + """Chart for regional wind turbines per square meter.""" + + lookup = "wind_turbines" + + def get_chart_data(self) -> list[float]: + """Calculate population for whole region.""" + return [ + float( + calculations.calculate_square_for_value( + pd.DataFrame({"turbines": models.WindTurbine.quantity_per_municipality().sum()}, index=[1]), + ).sum(), + ), + ] + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + chart_options["yAxis"]["name"] = _("") + return chart_options + + +class ElectricityDemandRegionChart(Chart): + """Chart for regional electricity demand.""" + + lookup = "electricity_demand" + + def get_chart_data(self) -> None: + """Calculate capacities for whole region.""" + return calculations.electricity_demand_per_municipality().sum() + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + chart_options["yAxis"]["name"] = _("GWh") + return chart_options + + +class ElectricityDemandCapitaRegionChart(Chart): + """Chart for regional electricity demand per population.""" + + lookup = "electricity_demand" + + def get_chart_data(self) -> pd.DataFrame: + """Calculate capacities for whole region.""" + return ( + calculations.calculate_capita_for_value( + pd.DataFrame(calculations.electricity_demand_per_municipality().sum()).transpose(), + ).sum() + * 1e6 + ) + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + chart_options["yAxis"]["name"] = _("kWh") + return chart_options + + +class HeatDemandRegionChart(Chart): + """Chart for regional heat demand.""" + + lookup = "heat_demand" + + def get_chart_data(self) -> None: + """Calculate capacities for whole region.""" + return calculations.heat_demand_per_municipality().sum() + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + chart_options["yAxis"]["name"] = _("GWh") + return chart_options + + +class HeatDemandCapitaRegionChart(Chart): + """Chart for regional heat demand per population.""" + + lookup = "heat_demand" + + def get_chart_data(self) -> None: + """Calculate capacities for whole region.""" + return ( + calculations.calculate_capita_for_value( + pd.DataFrame(calculations.heat_demand_per_municipality().sum()).transpose(), + ).sum() + * 1e6 + ) + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + chart_options["yAxis"]["name"] = _("kWh") + return chart_options + + +class BatteriesRegionChart(Chart): + """Chart for regional battery count.""" + + lookup = "wind_turbines" + + def get_chart_data(self) -> list: + """Calculate population for whole region.""" + return [int(calculations.batteries_per_municipality().sum())] + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + chart_options["yAxis"]["name"] = _("#") + del chart_options["series"][0]["name"] + return chart_options + + +class BatteriesCapacityRegionChart(Chart): + """Chart for regional battery capacity.""" + + lookup = "wind_turbines" + + def get_chart_data(self) -> list: + """Calculate population for whole region.""" + return [int(calculations.battery_capacities_per_municipality().sum())] + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + del chart_options["title"]["text"] + chart_options["yAxis"]["name"] = _("#") + del chart_options["series"][0]["name"] + return chart_options + + +CHARTS: dict[str, type[Chart]] = { + "electricity_overview": ElectricityOverviewChart, + "heat_overview": HeatOverviewChart, + "population_statusquo_region": PopulationRegionChart, + "population_density_statusquo_region": PopulationDensityRegionChart, + "employees_statusquo_region": EmployeesRegionChart, + "companies_statusquo_region": CompaniesRegionChart, + "capacity_statusquo_region": CapacityRegionChart, + "capacity_square_statusquo_region": CapacitySquareRegionChart, + "energy_statusquo_region": EnergyRegionChart, + "energy_2045_region": Energy2045RegionChart, + "energy_share_statusquo_region": EnergyShareRegionChart, + "energy_capita_statusquo_region": EnergyCapitaRegionChart, + "energy_square_statusquo_region": EnergySquareRegionChart, + "wind_turbines_statusquo_region": WindTurbinesRegionChart, + "wind_turbines_square_statusquo_region": WindTurbinesSquareRegionChart, + "electricity_demand_statusquo_region": ElectricityDemandRegionChart, + "electricity_demand_capita_statusquo_region": ElectricityDemandCapitaRegionChart, + "heat_demand_statusquo_region": HeatDemandRegionChart, + "heat_demand_capita_statusquo_region": HeatDemandCapitaRegionChart, + "batteries_statusquo_region": BatteriesRegionChart, + "batteries_capacity_statusquo_region": BatteriesCapacityRegionChart, +} + + +def create_chart(lookup: str, chart_data: Optional[Any] = None) -> dict: """ - chart = get_chart_options(lookup) - if chart_data: - series_type = chart["series"][0]["type"] - series_length = len(chart["series"]) - if series_type == "line": - data = [] - for key, value in chart_data: - year_as_string = f"{key}" - data.append([year_as_string, value]) - chart["series"][0]["data"] = data - elif series_length > 1: - for i in range(0, series_length): - chart["series"][i]["data"] = chart_data[i] - else: - chart["series"][0]["data"] = chart_data - - return chart - - -def merge_dicts(dict1: dict, dict2: dict) -> dict: - """ - Recursively merge two dictionaries. - - Parameters - ---------- - dict1: dict - Containing the first chart structure. Objects will be first. - dict2: dict - Containing the second chart structure. Objects will be last and - if they have the same name as ones from dict1 they overwrite the ones in first. - - Returns - ------- - dict - First chart modified and appended by second chart. + Return chart for given lookup. + + If chart is listed in CHARTS, specific chart is returned. Otherwise, generic chart is returned. """ - for key in dict2: - if key in dict1 and isinstance(dict1[key], dict) and isinstance(dict2[key], dict): - merge_dicts(dict1[key], dict2[key]) - elif key in dict1 and isinstance(dict1[key], list) and isinstance(dict2[key], list): - dict1[key].extend(dict2[key]) - else: - dict1[key] = dict2[key] - return dict1 + if lookup in CHARTS: + return CHARTS[lookup](lookup, chart_data).render() + return Chart(lookup, chart_data).render() diff --git a/digiplan/map/charts/capacity.json b/digiplan/map/charts/capacity.json index 209e75ca..7f237570 100644 --- a/digiplan/map/charts/capacity.json +++ b/digiplan/map/charts/capacity.json @@ -7,20 +7,21 @@ "legend": { "data": [ "Wind", - "Freiflächen-PV", "Aufdach-PV", + "Freiflächen-PV", + "Wasserkraft", "Bioenergie", - "Konventionell" + "Speicher" ], "orient": "vertical", - "right": "1%", - "bottom": "5%" + "right": "-5%", + "bottom": "15%" }, - "color": ["#1F82C0","#F6B93B","#FFD660","#98D47E","#CFCFCF"], + "color": ["#6A89CC","#FFD660","#EFAD25","#A9BDE8","#52C41A","#8D2D5F"], "xAxis": { "type": "category", "boundaryGap": true, - "data": ["Status Quo", "2045"], + "data": ["Status Quo"], "axisTick": "alignWithLabel" }, "yAxis": { @@ -34,32 +35,38 @@ { "type": "bar", "stack": "five", - "data": [36, 10], + "data": [36], "name": "Wind" }, { "type": "bar", "stack": "five", - "data": [36, 10], + "data": [10], + "name": "Aufdach-PV" + }, + { + "type": "bar", + "stack": "five", + "data": [36], "name": "Freiflächen-PV" }, { "type": "bar", "stack": "five", - "data": [10, 10], - "name": "Aufdach-PV" + "data": [10], + "name": "Wasserkraft" }, { "type": "bar", "stack": "five", - "data": [10, 10], + "data": [10], "name": "Bioenergie" }, { "type": "bar", "stack": "five", - "data": [10, 10], - "name": "Konventionell" + "data": [10], + "name": "Speicher" } ], "title": {"text": "installed capacity of different types"} diff --git a/digiplan/map/charts/capacity_square.json b/digiplan/map/charts/capacity_square.json deleted file mode 100644 index 5c693d20..00000000 --- a/digiplan/map/charts/capacity_square.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "grid": { - "top": "24%", - "right": "30%", - "bottom": "5%" - }, - "legend": { - "data": [ - "Wind", - "Freiflächen-PV", - "Aufdach-PV", - "Bioenergie", - "Konventionell" - ], - "orient": "vertical", - "right": "1%", - "bottom": "5%" - }, - "color": ["#1F82C0","#F6B93B","#FFD660","#98D47E","#CFCFCF"], - "xAxis": { - "type": "category", - "boundaryGap": true, - "data": ["Status Quo", "2045"], - "axisTick": "alignWithLabel" - }, - "yAxis": { - "type": "value", - "show": true, - "name": "MW", - "nameLocation": "end", - "nameTextStyle": "Roboto" - }, - "series": [ - { - "type": "bar", - "stack": "five", - "data": [36, 10], - "name": "Wind" - }, - { - "type": "bar", - "stack": "five", - "data": [36, 10], - "name": "Freiflächen-PV" - }, - { - "type": "bar", - "stack": "five", - "data": [10, 10], - "name": "Aufdach-PV" - }, - { - "type": "bar", - "stack": "five", - "data": [10, 10], - "name": "Bioenergie" - }, - { - "type": "bar", - "stack": "five", - "data": [10, 10], - "name": "Konventionell" - } - ], - "title": {"text": "installed capacity per km² in different types"} -} diff --git a/digiplan/map/charts/decentralized_centralized_heat.json b/digiplan/map/charts/decentralized_centralized_heat.json index 493bf9e1..84cf4117 100644 --- a/digiplan/map/charts/decentralized_centralized_heat.json +++ b/digiplan/map/charts/decentralized_centralized_heat.json @@ -1,18 +1,9 @@ { + "grid": { + "bottom": "28%" + }, "legend": { - "data": [ - "Kohleofen", - "Holzofen", - "Gasheizkessel", - "Solarthermiekollektor", - "Wärmepumpe", - "Thermische Energiespeicher", - "Große Gasheizkessel", - "Große Wärmepumpen", - "Power to Heat", - "Große Solarthermiekollektoren" - ], - "bottom": "12" + "bottom": "0" }, "brush": { "toolbox": ["rect", "polygon", "lineX", "lineY", "keep", "clear"], @@ -27,7 +18,7 @@ } }, "yAxis": { - "data": ["Status Quo", "Mein Szenario", "Ziel Szenario"], + "data": ["Ziel", "Mein Szenario", "Status Quo"], "axisLine": { "onZero": true }, "splitLine": { "show": false }, "splitArea": { "show": false } @@ -36,7 +27,7 @@ "type": "value", "show": true, "position": "bottom", - "name": "TWh", + "name": "GWh", "nameLocation": "end", "nameTextStyle": "Roboto", "width": "76", @@ -50,7 +41,7 @@ "type": "bar", "barWidth": "16", "stack": "five", - "color": "#604F4F", + "color": "#FFF7EC", "emphasis": { "itemStyle": { "shadowBlur": 10, @@ -63,7 +54,7 @@ "name": "Holzofen", "type": "bar", "stack": "five", - "color": "#610B0B", + "color": "#FEE8C8", "emphasis": { "itemStyle": { "shadowBlur": 10, @@ -76,7 +67,7 @@ "name": "Gasheizkessel", "type": "bar", "stack": "five", - "color": "#B1BEC6", + "color": "#FDD49E", "emphasis": { "itemStyle": { "shadowBlur": 10, @@ -89,7 +80,7 @@ "name": "Wärmepumpe", "type": "bar", "stack": "five", - "color": "#E6772E", + "color": "#FDBB84", "emphasis": { "itemStyle": { "shadowBlur": 10, @@ -99,23 +90,10 @@ "data": [136, 134, 130] }, { - "name": "Thermische Energiespeicher", - "type": "bar", - "stack": "five", - "color": "#DF3A01", - "emphasis": { - "itemStyle": { - "shadowBlur": 10, - "shadowColor": "rgba(0,0,0,0.3)" - } - }, - "data": [280, 150, 100] - }, - { - "name": "Solarthermiekollektor", + "name": "Solarthermie", "type": "bar", "stack": "five", - "color": "#FFD660", + "color": "#EF6548", "emphasis": { "itemStyle": { "shadowBlur": 10, @@ -125,10 +103,11 @@ "data": [412, 254, 100] }, { - "name": "Große Gasheizkessel", + "name": "FW: Gasheizkessel", "type": "bar", + "barWidth": "16", "stack": "four", - "color": "#B1BEC6", + "color": "#D7301F", "emphasis": { "itemStyle": { "shadowBlur": 10, @@ -138,10 +117,10 @@ "data": [300, 344, 380] }, { - "name": "Große Wärmepumpen", + "name": "FW: Wärmepumpen", "type": "bar", "stack": "four", - "color": "#E6772E", + "color": "#B30000", "emphasis": { "itemStyle": { "shadowBlur": 10, @@ -155,7 +134,7 @@ "type": "bar", "barWidth": "35", "stack": "four", - "color": "#D7DF01", + "color": "#7F0000", "emphasis": { "itemStyle": { "shadowBlur": 10, @@ -165,10 +144,10 @@ "data": [280, 300, 350] }, { - "name": "Große Solarthermiekollektoren", + "name": "FW: Solarthermie", "type": "bar", "stack": "four", - "color": "#FFD660", + "color": "#3F0000", "emphasis": { "itemStyle": { "shadowBlur": 10, diff --git a/digiplan/map/charts/detailed_overview.json b/digiplan/map/charts/detailed_overview.json index 26c3b3af..09490896 100644 --- a/digiplan/map/charts/detailed_overview.json +++ b/digiplan/map/charts/detailed_overview.json @@ -1,18 +1,4 @@ { - "legend": { - "data": [ - "Konventionell", - "Wind", - "Freiflächen-PV", - "Aufdach-PV", - "Bioenergie", - "GHD", - "Haushalt", - "Industrie", - "Sonstiges" - ], - "bottom": "12" - }, "brush": { "toolbox": ["rect", "polygon", "lineX", "lineY", "keep", "clear"], "xAxisIndex": 0 @@ -30,11 +16,11 @@ "top": "10%", "left": "3%", "right": "15%", - "bottom": "10%", + "bottom": "20%", "containLabel": true }, "yAxis": { - "data": ["Status Quo", "Mein Szenario", "Ziel Szenario"], + "data": ["Ziel 2045", "Mein Szenario", "Status Quo"], "axisLine": { "onZero": true }, "splitLine": { "show": false }, "splitArea": { "show": false } @@ -53,76 +39,77 @@ }, "series": [ { - "name": "Konventionell", + "name": "Windenergie", "type": "bar", - "barWidth": "16", - "stack": "five", - "color": "#CFCFCF", + "stack": "production", + "color": "#6A89CC", "emphasis": { "itemStyle": { "shadowBlur": 10, "shadowColor": "rgba(0,0,0,0.3)" } }, - "data": [132, 334, 700] + "data": [302, 234, 230] }, { - "name": "Wind", + "name": "Freiflächen-PV", "type": "bar", - "stack": "five", - "color": "#1F82C0", + "stack": "production", + "color": "#EFAD25", "emphasis": { "itemStyle": { "shadowBlur": 10, "shadowColor": "rgba(0,0,0,0.3)" } }, - "data": [302, 234, 230] + "data": [282, 234, 100] }, { - "name": "Freiflächen-PV", + "name": "Aufdach-PV", "type": "bar", - "stack": "five", - "color": "#F6B93B", + "stack": "production", + "color": "#FFD660", "emphasis": { "itemStyle": { "shadowBlur": 10, "shadowColor": "rgba(0,0,0,0.3)" } }, - "data": [282, 234, 100] + "data": [312, 254, 100] }, { - "name": "Aufdach-PV", + "name": "Bioenergie", "type": "bar", - "stack": "five", - "color": "#FFD660", + "stack": "production", + "color": "#52C41A", "emphasis": { "itemStyle": { "shadowBlur": 10, "shadowColor": "rgba(0,0,0,0.3)" } }, - "data": [312, 254, 100] + "data": [136, 134, 130] }, { - "name": "Bioenergie", + "name": "Wasserkraft", "type": "bar", - "stack": "five", - "color": "#98D47E", + "barWidth": "16", + "stack": "production", + "color": "#A9BDE8", "emphasis": { "itemStyle": { "shadowBlur": 10, "shadowColor": "rgba(0,0,0,0.3)" } }, - "data": [136, 134, 130] + "data": [132, 334, 700] }, { - "name": "GHD", + "name": "Stromverbrauch GHD", "type": "bar", - "stack": "four", - "color": "#F5F5DC", + "barWidth": "16", + "stack": "demand", + "color": "#D3D3D3", "emphasis": { "itemStyle": { "shadowBlur": 10, @@ -132,10 +119,10 @@ "data": [300, 344, 380] }, { - "name": "Haushalte", + "name": "Stromverbrauch Haushalte", "type": "bar", - "stack": "four", - "color": "#A8DADC", + "stack": "demand", + "color": "#969696", "emphasis": { "itemStyle": { "shadowBlur": 10, @@ -145,11 +132,11 @@ "data": [254, 244, 380] }, { - "name": "Industrie", + "name": "Stromverbrauch Industrie", "type": "bar", "barWidth": "35", - "stack": "four", - "color": "#C27BA0", + "stack": "demand", + "color": "#616161", "emphasis": { "itemStyle": { "shadowBlur": 10, @@ -159,10 +146,10 @@ "data": [280, 300, 350] }, { - "name": "Sonstiges", + "name": "BEV", "type": "bar", - "stack": "four", - "color": "#B0BEC5", + "stack": "demand", + "color": "#2F2F2F", "emphasis": { "itemStyle": { "shadowBlur": 10, diff --git a/digiplan/map/charts/elecricity_demand_capita.json b/digiplan/map/charts/elecricity_demand_capita.json deleted file mode 100644 index 29479a39..00000000 --- a/digiplan/map/charts/elecricity_demand_capita.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "grid": { - "top": "24%", - "right": "30%", - "bottom": "5%" - }, - "legend": { - "data": [ - "GHD", - "Haushalte", - "Industrie", - "Sonstiges" - ], - "orient": "vertical", - "right": "1%", - "bottom": "5%" - }, - "color": ["#F5F5DC", "#A8DADC", "#C27BA0", "#B0BEC5"], - "xAxis": { - "type": "category", - "boundaryGap": true, - "data": ["Status Quo", "2045"], - "axisTick": "alignWithLabel" - }, - "yAxis": { - "type": "value", - "show": true, - "name": "GWh", - "nameLocation": "end", - "nameTextStyle": "Roboto" - }, - "series": [ - { - "type": "bar", - "stack": "five", - "data": [36, 10], - "name": "GHD" - }, - { - "type": "bar", - "stack": "five", - "data": [36, 10], - "name": "Haushalte" - }, - { - "type": "bar", - "stack": "five", - "data": [10, 10], - "name": "Industrie" - }, - { - "type": "bar", - "stack": "five", - "data": [10, 10], - "name": "Sonstiges" - } - ], - "title": { "text": "Electricity Demand per Capita" } - } diff --git a/digiplan/map/charts/electricity_demand.json b/digiplan/map/charts/electricity_demand.json index ac44ebe4..cb66df8b 100644 --- a/digiplan/map/charts/electricity_demand.json +++ b/digiplan/map/charts/electricity_demand.json @@ -2,24 +2,23 @@ "grid": { "top": "24%", "right": "30%", - "bottom": "5%" + "bottom": "25%" }, "legend": { "data": [ - "GHD", "Haushalte", - "Industrie", - "Sonstiges" + "GHD", + "Industrie" ], "orient": "vertical", "right": "1%", - "bottom": "5%" + "bottom": "35%" }, - "color": ["#F5F5DC", "#A8DADC", "#C27BA0", "#B0BEC5"], + "color": ["#6F9BB2", "#98C1D7", "#376984"], "xAxis": { "type": "category", "boundaryGap": true, - "data": ["Status Quo", "2045"], + "data": ["Status Quo"], "axisTick": "alignWithLabel" }, "yAxis": { @@ -34,25 +33,19 @@ "type": "bar", "stack": "five", "data": [36, 10], - "name": "GHD" + "name": "Haushalte" }, { "type": "bar", "stack": "five", "data": [36, 10], - "name": "Haushalte" + "name": "GHD" }, { "type": "bar", "stack": "five", "data": [10, 10], "name": "Industrie" - }, - { - "type": "bar", - "stack": "five", - "data": [10, 10], - "name": "Sonstiges" } ], "title": { "text": "Electricity Demand" } diff --git a/digiplan/map/charts/electricity_ghg.json b/digiplan/map/charts/electricity_ghg.json index f14a49a5..be8cf73f 100644 --- a/digiplan/map/charts/electricity_ghg.json +++ b/digiplan/map/charts/electricity_ghg.json @@ -1,4 +1,7 @@ { + "grid": { + "bottom": "25%" + }, "xAxis": { "type": "value", "show": true, @@ -24,7 +27,7 @@ "type": "bar", "barWidth": "16", "stack": "total", - "color": "#F5F5DC", + "color": "#98C1D7", "label": { "show": false }, @@ -37,7 +40,7 @@ "name": "Haushalte", "type": "bar", "stack": "total", - "color": "#A8DADC", + "color": "#6F9BB2", "label": { "show": false }, @@ -50,7 +53,7 @@ "name": "Industrie", "type": "bar", "stack": "total", - "color": "#C27BA0", + "color": "#376984", "label": { "show": false }, @@ -63,7 +66,7 @@ "name": "Sonstiges", "type": "bar", "stack": "total", - "color": "#B0BEC5", + "color": "#0D425F", "label": { "show": false }, diff --git a/digiplan/map/charts/electricity_overview.json b/digiplan/map/charts/electricity_overview.json index 2bcbe680..09490896 100644 --- a/digiplan/map/charts/electricity_overview.json +++ b/digiplan/map/charts/electricity_overview.json @@ -1,4 +1,30 @@ { + "brush": { + "toolbox": ["rect", "polygon", "lineX", "lineY", "keep", "clear"], + "xAxisIndex": 0 + }, + "toolbox": { + "feature": { + "magicType": { + "type": ["stack"] + }, + "dataView": {} + } + }, + "tooltip": {}, + "grid": { + "top": "10%", + "left": "3%", + "right": "15%", + "bottom": "20%", + "containLabel": true + }, + "yAxis": { + "data": ["Ziel 2045", "Mein Szenario", "Status Quo"], + "axisLine": { "onZero": true }, + "splitLine": { "show": false }, + "splitArea": { "show": false } + }, "xAxis": { "type": "value", "show": true, @@ -11,131 +37,126 @@ "fontWeight": "300", "fontSize": "14" }, - "yAxis": { - "type": "category", - "data": ["Bedarf", "Ziel", "Mein Szeanrio", "Status Quo"], - "axisTick": { - "show": false - } - }, "series": [ { - "name": "Wind", + "name": "Windenergie", "type": "bar", - "barWidth": "16", - "stack": "total", - "color": "#1F82C0", - "label": { - "show": false - }, + "stack": "production", + "color": "#6A89CC", "emphasis": { - "focus": "series" + "itemStyle": { + "shadowBlur": 10, + "shadowColor": "rgba(0,0,0,0.3)" + } }, - "data": [0, 502, 400, 334] + "data": [302, 234, 230] }, { - "name": "Freiflächen - PV", + "name": "Freiflächen-PV", "type": "bar", - "stack": "total", - "color": "#F6B93B", - "label": { - "show": false - }, + "stack": "production", + "color": "#EFAD25", "emphasis": { - "focus": "series" + "itemStyle": { + "shadowBlur": 10, + "shadowColor": "rgba(0,0,0,0.3)" + } }, - "data": [0, 382, 300, 234] + "data": [282, 234, 100] }, { - "name": "Aufdach - PV", + "name": "Aufdach-PV", "type": "bar", - "stack": "total", + "stack": "production", "color": "#FFD660", - "label": { - "show": false - }, "emphasis": { - "focus": "series" + "itemStyle": { + "shadowBlur": 10, + "shadowColor": "rgba(0,0,0,0.3)" + } }, - "data": [0, 312, 280, 254] + "data": [312, 254, 100] }, { "name": "Bioenergie", "type": "bar", - "stack": "total", - "color": "#98D47E", - "label": { - "show": false - }, + "stack": "production", + "color": "#52C41A", "emphasis": { - "focus": "series" + "itemStyle": { + "shadowBlur": 10, + "shadowColor": "rgba(0,0,0,0.3)" + } }, - "data": [0, 136, 135, 134] + "data": [136, 134, 130] }, { - "name": "Konventionell", + "name": "Wasserkraft", "type": "bar", - "stack": "total", - "color": "#1A1A1A", - "label": { - "show": false - }, + "barWidth": "16", + "stack": "production", + "color": "#A9BDE8", "emphasis": { - "focus": "series" + "itemStyle": { + "shadowBlur": 10, + "shadowColor": "rgba(0,0,0,0.3)" + } }, - "data": [0, 132, 200, 534] + "data": [132, 334, 700] }, { - "name": "GHD", + "name": "Stromverbrauch GHD", "type": "bar", - "stack": "total", - "color": "#F5F5DC", - "label": { - "show": false - }, + "barWidth": "16", + "stack": "demand", + "color": "#D3D3D3", "emphasis": { - "focus": "series" + "itemStyle": { + "shadowBlur": 10, + "shadowColor": "rgba(0,0,0,0.3)" + } }, - "data": [400, 0, 0, 0] + "data": [300, 344, 380] }, { - "name": "Haushalte", + "name": "Stromverbrauch Haushalte", "type": "bar", - "stack": "total", - "color": "#A8DADC", - "label": { - "show": false - }, + "stack": "demand", + "color": "#969696", "emphasis": { - "focus": "series" + "itemStyle": { + "shadowBlur": 10, + "shadowColor": "rgba(0,0,0,0.3)" + } }, - "data": [360, 0, 0, 0] + "data": [254, 244, 380] }, { - "name": "Industrie", + "name": "Stromverbrauch Industrie", "type": "bar", - "stack": "total", - "color": "#C27BA0", - "label": { - "show": false - }, + "barWidth": "35", + "stack": "demand", + "color": "#616161", "emphasis": { - "focus": "series" + "itemStyle": { + "shadowBlur": 10, + "shadowColor": "rgba(0,0,0,0.3)" + } }, - "data": [300, 0, 0, 0] + "data": [280, 300, 350] }, { - "name": "Sonstiges", + "name": "BEV", "type": "bar", - "stack": "total", - "color": "#B0BEC5", - "label": { - "show": false - }, + "stack": "demand", + "color": "#2F2F2F", "emphasis": { - "focus": "series" + "itemStyle": { + "shadowBlur": 10, + "shadowColor": "rgba(0,0,0,0.3)" + } }, - "data": [350, 0, 0, 0] + "data": [145, 144, 180] } ] } diff --git a/digiplan/map/charts/ghg_history.json b/digiplan/map/charts/ghg_history.json new file mode 100644 index 00000000..ffcc1ca9 --- /dev/null +++ b/digiplan/map/charts/ghg_history.json @@ -0,0 +1,229 @@ +{ + "legend": { + "show": true + }, + "tooltip": { + "trigger": "item", + "formatter": "{a}: {c} kt CO₂-Äq." + }, + "yAxis": { + "name": "kt CO₂-Äquivalent" + }, + "xAxis": [ + { + "inverse": false, + "splitLine": { + "show": true + }, + "axisTick": { + "length": 0, + "lineStyle": { + "color": "#ccc" + } + }, + "axisLine": { + "lineStyle": { + "color": "#ccc" + } + }, + "data": [ + "-", + "-" + ] + }, + { + "name": "", + "nameLocation": "start", + "nameTextStyle": { + "fontWeight": "bold" + }, + "position": "bottom", + "offset": 60, + "axisLine": { + "onZero": false, + "show": false + }, + "axisTick": { + "length": 30, + "inside": true, + "lineStyle": { + "color": "#ccc" + } + }, + "axisLabel": { + "inside": true, + "fontWeight": "bold" + }, + "inverse": false, + "data": [ + "1990", + "2019" + ] + }, + { + "name": "", + "nameLocation": "start", + "nameTextStyle": { + "fontWeight": "bold" + }, + "position": "bottom", + "offset": 30, + "axisLine": { + "onZero": false, + "show": false + }, + "axisTick": { + "length": 30, + "inside": true, + "lineStyle": { + "color": "#ccc" + } + }, + "axisLabel": { + "inside": true + }, + "inverse": false, + "data": [ + "Sachsen-Anhalt", + "ABW", + "Sachsen-Anhalt", + "ABW" + ] + } + ], + "series": [ + { + "name": "Energiewirtschaft", + "stack": "st", + "type": "bar", + "color": "#E6772E", + "barWidth":"30", + "barGap": "250%", + "data": [ + 15680, + 11571 + ] + }, + { + "name": "Industrie", + "stack": "st", + "type": "bar", + "color": "#FA9FB5", + "barWidth":"30", + "data": [ + 20519, + 9011 + ] + }, + { + "name": "Verkehr", + "stack": "st", + "type": "bar", + "color": "#6C567B", + "barWidth":"30", + "data": [ + 3779, + 4007 + ] + }, + { + "name": "Gebäude", + "stack": "st", + "type": "bar", + "color": "#A8DADC", + "barWidth":"30", + "data": [ + 13943, + 3983 + ] + }, + { + "name": "Landwirtschaft", + "stack": "st", + "type": "bar", + "color": "#87D068", + "barWidth":"30", + "data": [ + 3275, + 2113 + ] + }, + { + "name": "Abfall und Sonst.", + "stack": "st", + "type": "bar", + "color": "#F5F5DC", + "barWidth":"30", + "data": [ + 1458, + 947 + ] + }, + { + "name": "Energiewirtschaft", + "stack": "abw", + "type": "bar", + "color": "#E6772E", + "barWidth":"30", + "data": [ + 930, + 538 + ] + }, + { + "name": "Industrie", + "stack": "abw", + "type": "bar", + "color": "#FA9FB5", + "barWidth":"30", + "data": [ + 4848, + 2129 + ] + }, + { + "name": "Verkehr", + "stack": "abw", + "type": "bar", + "color": "#6C567B", + "barWidth":"30", + "data": [ + 698, + 672 + ] + }, + { + "name": "Gebäude", + "stack": "abw", + "type": "bar", + "color": "#A8DADC", + "barWidth":"30", + "data": [ + 2434, + 695 + ] + }, + { + "name": "Landwirtschaft", + "type": "bar", + "stack": "abw", + "color": "#87D068", + "barWidth":"30", + "data": [ + 501, + 368 + ] + }, + { + "name": "Abfall und Sonst.", + "type": "bar", + "stack": "abw", + "color": "#F5F5DC", + "barWidth":"30", + "data": [ + 262, + 157 + ] + } + ] +} diff --git a/digiplan/map/charts/ghg_overview.json b/digiplan/map/charts/ghg_overview.json index e951585c..1d201e95 100644 --- a/digiplan/map/charts/ghg_overview.json +++ b/digiplan/map/charts/ghg_overview.json @@ -1,4 +1,7 @@ { + "grid": { + "bottom": "20%" + }, "backgroundColor": "#FFFFFF", "yAxis": { "show": true, @@ -26,7 +29,7 @@ "type": "bar", "barWidth": "16", "stack": "total", - "color": "#F2F2F2", + "color": "#D8E2E7", "label": { "show": false }, @@ -40,7 +43,7 @@ "type": "bar", "barWidth": "25", "stack": "total", - "color": "#F5F5DC", + "color": "#98C1D7", "label": { "show": false }, @@ -54,7 +57,7 @@ "type": "bar", "barWidth": "25", "stack": "total", - "color": "#74A9CF", + "color": "#6F9BB2", "label": { "show": false }, @@ -68,7 +71,7 @@ "type": "bar", "barWidth": "25", "stack": "total", - "color": "#FA9FB5", + "color": "#376984", "label": { "show": false }, @@ -82,7 +85,7 @@ "type": "bar", "barWidth": "25", "stack": "total", - "color": "#FEC44F", + "color": "#0D425F", "label": { "show": false }, @@ -96,7 +99,7 @@ "type": "bar", "barWidth": "25", "stack": "total", - "color": "#8C96C6", + "color": "#072130", "label": { "show": false }, diff --git a/digiplan/map/charts/ghg_reduction.json b/digiplan/map/charts/ghg_reduction.json new file mode 100644 index 00000000..0bf4e251 --- /dev/null +++ b/digiplan/map/charts/ghg_reduction.json @@ -0,0 +1,386 @@ +{ + "backgroundColor":"#FFFFFF", + "fontStyle":"Roboto", + "fontSize":"14", + "tooltip": {"trigger": "item"}, + "legend":{ + "show":true, + "bottom":"0" + }, + "grid":{ + "top":"10%", + "left":"3%", + "right":"15%", + "bottom":"15%", + "containLabel":true + }, + "xAxis":{ + "type":"category", + "splitLine":{ + "show":false + }, + "data":[ + "Emissionen 2019", + "Reduktion", + "2045" + ] + }, + "yAxis":{ + "type":"value" + }, + "series":[ + { + "name":"", + "type":"bar", + "stack":"Total", + "itemStyle":{ + "borderColor":"transparent", + "color":"transparent" + }, + "emphasis":{ + "itemStyle":{ + "borderColor":"transparent", + "color":"transparent" + } + }, + "data":[ + 0, + 3057, + 0 + ] + }, + { + "name":"Energiewirtschaft", + "type":"bar", + "barWidth":"30", + "stack":"Total", + "color":"#E6772E", + "label":{ + "show":false, + "position":"inside" + }, + "data":[ + 538, + 0, + 0 + ] + }, + { + "name":"Industrie", + "type":"bar", + "barWidth":"30", + "stack":"Total", + "color":"#FA9FB5", + "label":{ + "show":false, + "position":"inside" + }, + "data":[ + 2129, + 0, + 0 + ] + }, + { + "name":"Verkehr", + "type":"bar", + "barWidth":"30", + "stack":"Total", + "color":"#6C567B", + "label":{ + "show":false, + "position":"inside" + }, + "data":[ + 672, + 0, + 0 + ] + }, + { + "name":"Gebäude", + "type":"bar", + "barWidth":"30", + "stack":"Total", + "color":"#A8DADC", + "label":{ + "show":false, + "position":"inside" + }, + "data":[ + 695, + 0, + 0 + ] + }, + { + "name":"Landwirtschaft", + "type":"bar", + "barWidth":"30", + "stack":"Total", + "color":"#87D068", + "label":{ + "show":false, + "position":"inside" + }, + "data":[ + 368, + 0, + 0 + ] + }, + { + "name":"Abfall und Sonst.", + "type":"bar", + "barWidth":"30", + "color":"#F5F5DC", + "stack":"Total", + "label":{ + "show":false, + "position":"inside" + }, + "data":[ + 157, + 0, + 0 + ] + }, + { + "name":"Importe", + "type":"bar", + "barWidth":"30", + "stack":"Total", + "color":"#D9B38C", + "label":{ + "show":false, + "position":"inside", + "color":"#666" + }, + "legend":false, + "data":[ + 0, + 500, + 0 + ] + }, + { + "name":"Regionale Erzeugung", + "type":"bar", + "barWidth":"30", + "stack":"Total", + "color":"#48BF91", + "label":{ + "show":false, + "position":"inside", + "color":"#666" + }, + "data":[ + 0, + 1000, + 0 + ] + }, + { + "name":{ + "name":"Referenzlinie" + }, + "type":"line", + "polyline":true, + "symbol":"none", + "symbolSize":"0", + "symbolRotate":"-90", + "lineStyle":{ + "type":"dashed" + }, + "color":"#808B96", + "label":{ + "show":false + }, + "data":[ + 4557, + 4557, + 4557 + ] + }, + { + "name":"", + "type":"lines", + "coordinateSystem":"cartesian2d", + "emphasis":{ + "label":{ + "show":false + } + }, + "polyline":false, + "symbol":[ + "none", + "triangle" + ], + "symbolSize":[ + 60, + 60 + ], + "z":1, + "lineStyle":{ + "color":"#ccc", + "width":30, + "opacity":0.15, + "type":"solid" + }, + "data":[ + { + "coords":[ + [ + 0, + 4557 + ], + [ + 2, + 200 + ] + ] + } + ] + }, + { + "name":"", + "type":"lines", + "coordinateSystem":"cartesian2d", + "emphasis":{ + "label":{ + "show":false + } + }, + "polyline":false, + "symbol":[ + "none", + "triangle" + ], + "symbolSize":[ + 30, + 30 + ], + "lineStyle":{ + "color":"#ccc", + "width":16, + "opacity":1, + "type":"solid" + }, + "data":[ + { + "coords":[ + [ + 1, + 2000 + ], + [ + 1, + 1000 + ] + ] + } + ] + } + ], + "graphic":[ + { + "type":"group", + "left":"40%", + "top":"3%", + "children":[ + + { + "type":"text", + "z":100, + "left":"center", + "top":"middle", + "style":{ + "fill":"#333", + "width":150, + "overflow":"break", + "text":"Reduktion durch", + "font":"14px Roboto" + } + } + ] + }, + { + "type":"group", + "left":"60%", + "top":"22%", + "children":[ + { + "type":"rect", + "z":100, + "left":"center", + "top":"middle", + "shape":{ + "width":160, + "height":30 + }, + "style":{ + "fill":"#48BF91", + "stroke":"#555", + "lineWidth":0, + "shadowBlur":8, + "shadowOffsetX":3, + "shadowOffsetY":3, + "shadowColor":"rgba(0,0,0,0.2)" + } + }, + { + "type":"text", + "z":100, + "left":"center", + "top":"middle", + "style":{ + "fill":"#fff", + "width":160, + "overflow":"break", + "text":"Regionale Erzeugung", + "font":"14px Roboto" + } + } + ] + }, + { + "type":"group", + "left":"60%", + "top":"32%", + "children":[ + { + "type":"rect", + "z":100, + "left":"center", + "top":"middle", + "shape":{ + "width":160, + "height":30 + }, + "style":{ + "fill":"#D9B38C", + "stroke":"#555", + "lineWidth":0, + "shadowBlur":8, + "shadowOffsetX":3, + "shadowOffsetY":3, + "shadowColor":"rgba(0,0,0,0.2)" + } + }, + { + "type":"text", + "z":100, + "left":"center", + "top":"middle", + "style":{ + "fill":"#fff", + "width":160, + "overflow":"break", + "text":"Importe", + "font":"14px Roboto" + } + } + ] + } + ] +} diff --git a/digiplan/map/charts/heat_demand.json b/digiplan/map/charts/heat_demand.json index 409b33e4..852a33a3 100644 --- a/digiplan/map/charts/heat_demand.json +++ b/digiplan/map/charts/heat_demand.json @@ -2,24 +2,23 @@ "grid": { "top": "24%", "right": "30%", - "bottom": "5%" + "bottom": "28%" }, "legend": { "data": [ - "GHD", "Haushalte", - "Industrie", - "Sonstiges" + "GHD", + "Industrie" ], "orient": "vertical", "right": "1%", - "bottom": "5%" + "bottom": "35%" }, - "color": ["#F5F5DC", "#A8DADC", "#C27BA0", "#B0BEC5"], + "color": ["#6F9BB2", "#98C1D7", "#376984"], "xAxis": { "type": "category", "boundaryGap": true, - "data": ["Status Quo", "2045"], + "data": ["Status Quo"], "axisTick": "alignWithLabel" }, "yAxis": { @@ -34,25 +33,19 @@ "type": "bar", "stack": "five", "data": [36, 10], - "name": "GHD" + "name": "Haushalte" }, { "type": "bar", "stack": "five", "data": [36, 10], - "name": "Haushalte" + "name": "GHD" }, { "type": "bar", "stack": "five", "data": [10, 10], "name": "Industrie" - }, - { - "type": "bar", - "stack": "five", - "data": [10, 10], - "name": "Sonstiges" } ], "title": { "text": "Heat Demand" } diff --git a/digiplan/map/charts/heat_demand_capita.json b/digiplan/map/charts/heat_demand_capita.json deleted file mode 100644 index bbce9c90..00000000 --- a/digiplan/map/charts/heat_demand_capita.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "grid": { - "top": "24%", - "right": "30%", - "bottom": "5%" - }, - "legend": { - "data": [ - "GHD", - "Haushalte", - "Industrie", - "Sonstiges" - ], - "orient": "vertical", - "right": "1%", - "bottom": "5%" - }, - "color": ["#F5F5DC", "#A8DADC", "#C27BA0", "#B0BEC5"], - "xAxis": { - "type": "category", - "boundaryGap": true, - "data": ["Status Quo", "2045"], - "axisTick": "alignWithLabel" - }, - "yAxis": { - "type": "value", - "show": true, - "name": "GWh", - "nameLocation": "end", - "nameTextStyle": "Roboto" - }, - "series": [ - { - "type": "bar", - "stack": "five", - "data": [36, 10], - "name": "GHD" - }, - { - "type": "bar", - "stack": "five", - "data": [36, 10], - "name": "Haushalte" - }, - { - "type": "bar", - "stack": "five", - "data": [10, 10], - "name": "Industrie" - }, - { - "type": "bar", - "stack": "five", - "data": [10, 10], - "name": "Sonstiges" - } - ], - "title": { "text": "Heat Demand per Capita" } - } diff --git a/digiplan/map/charts/mobility_ghg.json b/digiplan/map/charts/mobility_ghg.json index 5440bfba..ae017195 100644 --- a/digiplan/map/charts/mobility_ghg.json +++ b/digiplan/map/charts/mobility_ghg.json @@ -1,4 +1,7 @@ { + "grid": { + "bottom": "20%" + }, "xAxis": { "type": "value", "show": true, @@ -24,7 +27,7 @@ "type": "bar", "barWidth": "16", "stack": "total", - "color": "#C8D8E4", + "color": "#D8E2E7", "label": { "show": false }, @@ -37,7 +40,7 @@ "name": "Konventionell", "type": "bar", "stack": "total", - "color": "#647078", + "color": "#A1B3BC", "label": { "show": false }, @@ -50,7 +53,7 @@ "name": "Erneuerbare Energien", "type": "bar", "stack": "total", - "color": "#A8E7BA", + "color": "#06DFA7", "label": { "show": false }, diff --git a/digiplan/map/charts/mobility_overview.json b/digiplan/map/charts/mobility_overview.json index 52899cc2..9d86c5e7 100644 --- a/digiplan/map/charts/mobility_overview.json +++ b/digiplan/map/charts/mobility_overview.json @@ -1,4 +1,7 @@ { + "grid": { + "bottom": "20%" + }, "xAxis": { "type": "value", "show": true, @@ -24,7 +27,7 @@ "type": "bar", "barWidth": "16", "stack": "total", - "color": "#647078", + "color": "#DCD9F0", "label": { "show": false }, @@ -37,7 +40,7 @@ "name": "Benzin", "type": "bar", "stack": "total", - "color": "#866E18", + "color": "#B5ADE0", "label": { "show": false }, @@ -50,7 +53,7 @@ "name": "Hybrid", "type": "bar", "stack": "total", - "color": "#8FDCE1", + "color": "#897BD9", "label": { "show": false }, @@ -63,7 +66,7 @@ "name": "E-Auto", "type": "bar", "stack": "total", - "color": "#98D47E", + "color": "#6956D6", "label": { "show": false }, diff --git a/digiplan/map/charts/overview_heat.json b/digiplan/map/charts/overview_heat.json index d7a14c0d..9236797d 100644 --- a/digiplan/map/charts/overview_heat.json +++ b/digiplan/map/charts/overview_heat.json @@ -1,9 +1,12 @@ { + "grid": { + "bottom": "20%" + }, "xAxis": { "type": "value", "show": true, "position": "bottom", - "name": "TWh", + "name": "GWh", "nameLocation": "end", "nameTextStyle": "Roboto", "width": "76", @@ -13,7 +16,7 @@ }, "yAxis": { "type": "category", - "data": ["Ziel", "Mein Szeanrio", "Status Quo"], + "data": ["Ziel", "Mein Szenario", "Status Quo"], "axisTick": { "show": false } @@ -24,7 +27,7 @@ "type": "bar", "barWidth": "16", "stack": "total", - "color": "#F5F5DC", + "color": "#B3B3B3", "label": { "show": false }, @@ -37,7 +40,7 @@ "name": "Haushalte", "type": "bar", "stack": "total", - "color": "#A8DADC", + "color": "#7C7C7C", "label": { "show": false }, @@ -50,7 +53,7 @@ "name": "Industrie", "type": "bar", "stack": "total", - "color": "#C27BA0", + "color": "#4F4F4F", "label": { "show": false }, @@ -58,19 +61,6 @@ "focus": "series" }, "data": [200, 250, 350] - }, - { - "name": "Sonstiges", - "type": "bar", - "stack": "total", - "color": "#B0BEC5", - "label": { - "show": false - }, - "emphasis": { - "focus": "series" - }, - "data": [150, 150, 150] } ] } diff --git a/digiplan/map/charts/population.json b/digiplan/map/charts/population.json index 49c6b8ce..d66f354b 100644 --- a/digiplan/map/charts/population.json +++ b/digiplan/map/charts/population.json @@ -29,5 +29,5 @@ "name": "Population" } ], - "title": {"text": "population in different years"} + "title": {"text": "Population per year"} } diff --git a/digiplan/map/charts/population_density.json b/digiplan/map/charts/population_density.json deleted file mode 100644 index a51eb078..00000000 --- a/digiplan/map/charts/population_density.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "tooltip": { - "trigger": "item", - "axisPointer": { - "type": "cross" - } - }, - "grid": { - "top": "24%" - }, - "xAxis": { - "type": "time", - "xAxisLabel":{ - "formatter": "{yyyy}" - } - }, - "yAxis": { - "type": "value", - "show": true, - "name": "Density per km²", - "nameLocation": "end", - "nameTextStyle": "Roboto" - }, - "series": [ - { - "type": "line", - "barWidth": "16", - "data": [5, 20, 36, 10, 10], - "name": "Population per km²" - } - ], - "title": {"text": "population density in different years"} -} diff --git a/digiplan/map/charts/renewable_electricity_production.json b/digiplan/map/charts/renewable_electricity_production.json index c50d970e..261fe90c 100644 --- a/digiplan/map/charts/renewable_electricity_production.json +++ b/digiplan/map/charts/renewable_electricity_production.json @@ -2,7 +2,7 @@ "grid": { "top": "24%", "right": "30%", - "bottom": "5%" + "bottom": "25%" }, "legend": { "data": [ @@ -16,7 +16,7 @@ "right": "1%", "bottom": "5%" }, - "color": ["#1F82C0", "#F6B93B", "#FFD660", "#98D47E", "#CFCFCF"], + "color": ["#6A89CC", "#EFAD25", "#FFD660", "#52C41A", "#A1B3BC"], "xAxis": { "type": "category", "boundaryGap": true, diff --git a/digiplan/map/charts/renewable_electricity_production_capita.json b/digiplan/map/charts/renewable_electricity_production_capita.json deleted file mode 100644 index 743a8398..00000000 --- a/digiplan/map/charts/renewable_electricity_production_capita.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "grid": { - "top": "24%", - "right": "30%", - "bottom": "5%" - }, - "legend": { - "data": [ - "Wind", - "Freiflächen-PV", - "Aufdach-PV", - "Bioenergie", - "Konventionell" - ], - "orient": "vertical", - "right": "1%", - "bottom": "5%" - }, - "color": ["#1F82C0", "#F6B93B", "#FFD660", "#98D47E", "#CFCFCF"], - "xAxis": { - "type": "category", - "boundaryGap": true, - "data": ["Status Quo", "2045"], - "axisTick": "alignWithLabel" - }, - "yAxis": { - "type": "value", - "show": true, - "name": "MWh", - "nameLocation": "end", - "nameTextStyle": "Roboto" - }, - "series": [ - { - "type": "bar", - "stack": "five", - "data": [36, 10], - "name": "Wind" - }, - { - "type": "bar", - "stack": "five", - "data": [36, 10], - "name": "Freiflächen-PV" - }, - { - "type": "bar", - "stack": "five", - "data": [10, 10], - "name": "Aufdach-PV" - }, - { - "type": "bar", - "stack": "five", - "data": [10, 10], - "name": "Bioenergie" - }, - { - "type": "bar", - "stack": "five", - "data": [10, 10], - "name": "Konventionell" - } - ], - "title": { "text": "Renewable Electricity Production per Capita" } - } diff --git a/digiplan/map/charts/renewable_electricity_production_square.json b/digiplan/map/charts/renewable_electricity_production_square.json deleted file mode 100644 index 1f2a7ef5..00000000 --- a/digiplan/map/charts/renewable_electricity_production_square.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "grid": { - "top": "24%", - "right": "30%", - "bottom": "5%" - }, - "legend": { - "data": [ - "Wind", - "Freiflächen-PV", - "Aufdach-PV", - "Bioenergie", - "Konventionell" - ], - "orient": "vertical", - "right": "1%", - "bottom": "5%" - }, - "color": ["#1F82C0", "#F6B93B", "#FFD660", "#98D47E", "#CFCFCF"], - "xAxis": { - "type": "category", - "boundaryGap": true, - "data": ["Status Quo", "2045"], - "axisTick": "alignWithLabel" - }, - "yAxis": { - "type": "value", - "show": true, - "name": "MWh", - "nameLocation": "end", - "nameTextStyle": "Roboto" - }, - "series": [ - { - "type": "bar", - "stack": "five", - "data": [36, 10], - "name": "Wind" - }, - { - "type": "bar", - "stack": "five", - "data": [36, 10], - "name": "Freiflächen-PV" - }, - { - "type": "bar", - "stack": "five", - "data": [10, 10], - "name": "Aufdach-PV" - }, - { - "type": "bar", - "stack": "five", - "data": [10, 10], - "name": "Bioenergie" - }, - { - "type": "bar", - "stack": "five", - "data": [10, 10], - "name": "Konventionell" - } - ], - "title": { "text": "Renewable Electricity Production per km²" } - } diff --git a/digiplan/map/charts/wind_turbines.json b/digiplan/map/charts/wind_turbines.json index d855af87..6bcc0477 100644 --- a/digiplan/map/charts/wind_turbines.json +++ b/digiplan/map/charts/wind_turbines.json @@ -9,10 +9,10 @@ "top": "24%" }, "xAxis": { - "type": "time", - "xAxisLabel":{ - "formatter": "{yyyy}" - } + "type": "category", + "boundaryGap": true, + "data": ["Status Quo"], + "axisTick": "alignWithLabel" }, "yAxis": { "type": "value", @@ -23,9 +23,9 @@ }, "series": [ { - "type": "line", + "type": "bar", "barWidth": "16", - "data": [5, 20, 36, 10, 10], + "data": [5], "name": "Wind Turbines" } ], diff --git a/digiplan/map/charts/wind_turbines_square.json b/digiplan/map/charts/wind_turbines_square.json deleted file mode 100644 index 0c231384..00000000 --- a/digiplan/map/charts/wind_turbines_square.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "tooltip": { - "trigger": "item", - "axisPointer": { - "type": "cross" - } - }, - "grid": { - "top": "24%" - }, - "xAxis": { - "type": "time", - "xAxisLabel":{ - "formatter": "{yyyy}" - } - }, - "yAxis": { - "type": "value", - "show": true, - "name": "Wind Turbines", - "nameLocation": "end", - "nameTextStyle": "Roboto" - }, - "series": [ - { - "type": "line", - "barWidth": "16", - "data": [5, 20, 36, 10, 10], - "name": "Wind Turbines" - } - ], - "title": { "text": "number of wind turbines per km²" } -} diff --git a/digiplan/map/choropleths.py b/digiplan/map/choropleths.py index 828cfdad..d9bbd884 100644 --- a/digiplan/map/choropleths.py +++ b/digiplan/map/choropleths.py @@ -4,6 +4,7 @@ from collections.abc import Callable from typing import Optional, Union +import pandas as pd from django.conf import settings from django.http.response import JsonResponse @@ -73,50 +74,156 @@ def render(self) -> JsonResponse: values = self.get_values_per_feature() paint_properties = self.get_paint_properties() paint_properties["fill-color"] = self.get_fill_color(values) - return JsonResponse({"values": self.get_values_per_feature(), "paintProperties": paint_properties}) + return JsonResponse({"values": values, "paintProperties": paint_properties}) -class RenewableElectricityProductionChoropleth(Choropleth): # noqa: D101 +class EnergyShareChoropleth(Choropleth): # noqa: D101 def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 - return calculations.capacity_per_municipality() + return calculations.energy_shares_per_municipality().sum(axis=1).to_dict() -class CapacityChoropleth(Choropleth): # noqa: D101 +class EnergyChoropleth(Choropleth): # noqa: D101 + def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 + return calculations.energies_per_municipality().sum(axis=1).to_dict() + + +class Energy2045Choropleth(Choropleth): # noqa: D101 + def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 + return calculations.energies_per_municipality_2045(self.map_state["simulation_id"]).sum(axis=1).to_dict() + + +class EnergyCapitaChoropleth(Choropleth): # noqa: D101 + def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 + energies = calculations.energies_per_municipality() + energies_per_capita = calculations.calculate_capita_for_value(energies) * 1e3 + return energies_per_capita.sum(axis=1).to_dict() + + +class EnergyCapita2045Choropleth(Choropleth): # noqa: D101 + def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 + energies = calculations.energies_per_municipality_2045(self.map_state["simulation_id"]) + energies_per_capita = calculations.calculate_capita_for_value(energies) * 1e3 + return energies_per_capita.sum(axis=1).to_dict() + + +class EnergySquareChoropleth(Choropleth): # noqa: D101 + def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 + energies = calculations.energies_per_municipality() + energies_per_square = calculations.calculate_square_for_value(energies) * 1e3 + return energies_per_square.sum(axis=1).to_dict() + + +class EnergySquare2045Choropleth(Choropleth): # noqa: D101 def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 - return calculations.capacity_per_municipality() + energies = calculations.energies_per_municipality_2045(self.map_state["simulation_id"]) + energies_per_square = calculations.calculate_square_for_value(energies) * 1e3 + return energies_per_square.sum(axis=1).to_dict() + + +class CapacityChoropleth(Choropleth): # noqa: D101 + def get_values_per_feature(self) -> pd.DataFrame: # noqa: D102 + capacities = calculations.capacities_per_municipality().sum(axis=1) + return capacities.to_dict() class CapacitySquareChoropleth(Choropleth): # noqa: D101 def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 - return calculations.capacity_square_per_municipality() + capacities = calculations.capacities_per_municipality() + capacities_square = calculations.calculate_square_for_value(capacities) + return capacities_square.sum(axis=1).to_dict() class PopulationChoropleth(Choropleth): # noqa: D101 def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 - return models.Population.population_per_municipality() + return models.Population.quantity_per_municipality_per_year().sum(axis=1).to_dict() class PopulationDensityChoropleth(Choropleth): # noqa: D101 def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 - return models.Population.density_per_municipality() + population = models.Population.quantity_per_municipality_per_year() + population_square = calculations.calculate_square_for_value(population) + return population_square.sum(axis=1).to_dict() + + +class EmployeesChoropleth(Choropleth): # noqa: D101 + def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 + return calculations.employment_per_municipality().to_dict() + + +class CompaniesChoropleth(Choropleth): # noqa: D101 + def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 + return calculations.companies_per_municipality().to_dict() class WindTurbinesChoropleth(Choropleth): # noqa: D101 def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 - return models.WindTurbine.quantity_per_municipality() + return models.WindTurbine.quantity_per_municipality().to_dict() class WindTurbinesSquareChoropleth(Choropleth): # noqa: D101 def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 - return models.WindTurbine.quantity_per_square() + wind_turbines = models.WindTurbine.quantity_per_municipality() + wind_turbines_square = calculations.calculate_square_for_value(wind_turbines) + return wind_turbines_square.to_dict() + + +class ElectricityDemandChoropleth(Choropleth): # noqa: D101 + def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 + return calculations.electricity_demand_per_municipality().sum(axis=1).to_dict() + + +class ElectricityDemandCapitaChoropleth(Choropleth): # noqa: D101 + def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 + capita_demand = ( + calculations.calculate_capita_for_value(calculations.electricity_demand_per_municipality()).sum(axis=1) + * 1e6 + ) + return capita_demand.to_dict() + + +class HeatDemandChoropleth(Choropleth): # noqa: D101 + def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 + return calculations.heat_demand_per_municipality().sum(axis=1).to_dict() + + +class HeatDemandCapitaChoropleth(Choropleth): # noqa: D101 + def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 + capita_demand = ( + calculations.calculate_capita_for_value(calculations.heat_demand_per_municipality()).sum(axis=1) * 1e6 + ) + return capita_demand.to_dict() + + +class BatteriesChoropleth(Choropleth): # noqa: D101 + def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 + return calculations.batteries_per_municipality().to_dict() + + +class BatteriesCapacityChoropleth(Choropleth): # noqa: D101 + def get_values_per_feature(self) -> dict[int, float]: # noqa: D102 + return calculations.battery_capacities_per_municipality().to_dict() CHOROPLETHS: dict[str, Union[Callable, type(Choropleth)]] = { - "capacity": CapacityChoropleth, - "capacity_square": CapacitySquareChoropleth, - "population": PopulationChoropleth, - "population_density": PopulationDensityChoropleth, - "wind_turbines": WindTurbinesChoropleth, - "wind_turbines_square": WindTurbinesSquareChoropleth, - "renewable_electricity_production": RenewableElectricityProductionChoropleth, + "population_statusquo": PopulationChoropleth, + "population_density_statusquo": PopulationDensityChoropleth, + "employees_statusquo": EmployeesChoropleth, + "companies_statusquo": CompaniesChoropleth, + "energy_statusquo": EnergyChoropleth, + "energy_2045": Energy2045Choropleth, + "energy_share_statusquo": EnergyShareChoropleth, + "energy_capita_statusquo": EnergyCapitaChoropleth, + "energy_capita_2045": EnergyCapita2045Choropleth, + "energy_square_statusquo": EnergySquareChoropleth, + "energy_square_2045": EnergySquare2045Choropleth, + "capacity_statusquo": CapacityChoropleth, + "capacity_square_statusquo": CapacitySquareChoropleth, + "wind_turbines_statusquo": WindTurbinesChoropleth, + "wind_turbines_square_statusquo": WindTurbinesSquareChoropleth, + "electricity_demand_statusquo": ElectricityDemandChoropleth, + "electricity_demand_capita_statusquo": ElectricityDemandCapitaChoropleth, + "heat_demand_statusquo": HeatDemandChoropleth, + "heat_demand_capita_statusquo": HeatDemandCapitaChoropleth, + "batteries_statusquo": BatteriesChoropleth, + "batteries_capacity_statusquo": BatteriesCapacityChoropleth, } diff --git a/digiplan/map/config.py b/digiplan/map/config.py index d56960a0..6c77dc1f 100644 --- a/digiplan/map/config.py +++ b/digiplan/map/config.py @@ -1,17 +1,18 @@ """Configuration for map app.""" import json import pathlib +from pathlib import Path +import pandas as pd from django.conf import settings from django.utils.translation import gettext_lazy as _ from digiplan import __version__ -from . import utils +from . import datapackage, utils # DIRECTORIES MAP_DIR = settings.APPS_DIR.path("map") -POPUPS_DIR = MAP_DIR.path("popups") CHARTS_DIR = MAP_DIR.path("charts") SCENARIOS_DIR = settings.DATA_DIR.path("scenarios") @@ -19,8 +20,12 @@ ENERGY_SETTINGS_PANEL_FILE = settings.APPS_DIR.path("static/config/energy_settings_panel.json") HEAT_SETTINGS_PANEL_FILE = settings.APPS_DIR.path("static/config/heat_settings_panel.json") TRAFFIC_SETTINGS_PANEL_FILE = settings.APPS_DIR.path("static/config/traffic_settings_panel.json") +ADDITIONAL_ENERGY_SETTINGS_FILE = settings.DATA_DIR.path("digipipe/settings/energy_settings_panel.json") +ADDITIONAL_HEAT_SETTINGS_FILE = settings.DATA_DIR.path("digipipe/settings/heat_settings_panel.json") +ADDITIONAL_TRAFFIC_SETTINGS_FILE = settings.DATA_DIR.path("digipipe/settings/traffic_settings_panel.json") SETTINGS_DEPENDENCY_MAP_FILE = settings.APPS_DIR.path("static/config/settings_dependency_map.json") DEPENDENCY_PARAMETERS_FILE = settings.APPS_DIR.path("static/config/dependency_parameters.json") +TECHNOLOGY_DATA_FILE = settings.DIGIPIPE_DIR.path("scalars").path("technology_data.json") # FILTERS FILTER_DEFINITION = {} @@ -30,18 +35,92 @@ ENERGY_SETTINGS_PANEL = utils.get_translated_json_from_file(ENERGY_SETTINGS_PANEL_FILE) HEAT_SETTINGS_PANEL = utils.get_translated_json_from_file(HEAT_SETTINGS_PANEL_FILE) TRAFFIC_SETTINGS_PANEL = utils.get_translated_json_from_file(TRAFFIC_SETTINGS_PANEL_FILE) +ADDITIONAL_ENERGY_SETTINGS = utils.get_translated_json_from_file(ADDITIONAL_ENERGY_SETTINGS_FILE) +ADDITIONAL_HEAT_SETTINGS = utils.get_translated_json_from_file(ADDITIONAL_HEAT_SETTINGS_FILE) +ADDITIONAL_TRAFFIC_SETTINGS = utils.get_translated_json_from_file(ADDITIONAL_TRAFFIC_SETTINGS_FILE) SETTINGS_DEPENDENCY_MAP = utils.get_translated_json_from_file(SETTINGS_DEPENDENCY_MAP_FILE) DEPENDENCY_PARAMETERS = utils.get_translated_json_from_file(DEPENDENCY_PARAMETERS_FILE) +TECHNOLOGY_DATA = utils.get_translated_json_from_file(TECHNOLOGY_DATA_FILE) + + +def get_all_settings() -> dict: + """ + Concatenate all Settings. + + Returns + ------- + dict + one dict with all settings concatenated + """ + all_settings = {} + for setting_dict in [ + ENERGY_SETTINGS_PANEL, + HEAT_SETTINGS_PANEL, + TRAFFIC_SETTINGS_PANEL, + ADDITIONAL_ENERGY_SETTINGS, + ADDITIONAL_HEAT_SETTINGS, + ADDITIONAL_TRAFFIC_SETTINGS, + ]: + all_settings.update(setting_dict) + return all_settings + + +def get_slider_marks() -> dict: + """ + get all status quo values and future scenario values for all settings. + + Returns + ------- + dict + one dict with all values in correct format for usage + """ + all_settings = get_all_settings().items() + slider_marks = {} + for param_name, param_data in all_settings: + if "status_quo" in param_data: + if param_name in slider_marks: + slider_marks[param_name].append(("Heute", param_data["status_quo"])) + else: + slider_marks[param_name] = [("Heute", param_data["status_quo"])] + if "future_scenario" in param_data: + if param_name in slider_marks: + slider_marks[param_name].append(("2045", param_data["future_scenario"])) + else: + slider_marks[param_name] = [("2045", param_data["future_scenario"])] + return slider_marks + + +def get_slider_per_sector() -> dict: + """ + get demand per sector. + + Returns + ------- + dict + demand per sector for each slider + """ + sector_dict = { + "s_v_1": {"hh": 0, "ind": 0, "cts": 0}, + "w_v_1": {"hh": 0, "ind": 0, "cts": 0}, + "w_d_wp_1": {"hh": 0, "ind": 0, "cts": 0}, + } + demand = {"s_v_1": "power_demand", "w_v_1": "heat_demand", "w_d_wp_1": "heat_demand_dec"} + sectors = ["hh", "ind", "cts"] + for key, value in demand.items(): + for sector in sectors: + file = f"demand_{sector}_{value}.csv" + path = Path(settings.DATA_DIR, "digipipe/scalars", file) + reader = pd.read_csv(path) + sector_dict[key][sector] = reader["2022"].sum() + return sector_dict # STORE STORE_COLD_INIT = { "version": __version__, - "slider_marks": { - param_name: [("Status Quo", param_data["status_quo"])] - for param_name, param_data in ENERGY_SETTINGS_PANEL.items() - if "status_quo" in param_data - }, + "slider_marks": get_slider_marks(), + "slider_max": datapackage.get_potential_values(), + "slider_per_sector": get_slider_per_sector(), "allowedSwitches": ["wind_distance"], "detailTab": {"showPotentialLayers": True}, "staticState": 0, @@ -92,18 +171,26 @@ def init_sources() -> dict[str, dict]: # SIMULATION SIMULATION_RENEWABLES = { - "ABW-solar-pv_ground": _("Freiflächen-PV"), - "ABW-solar-pv_rooftop": _("Aufdach-PV"), - "ABW-wind-onshore": _("Wind"), + "ABW-solar-pv_ground": _("Outdoor PV"), + "ABW-solar-pv_rooftop": _("Roof-mounted PV"), + "ABW-wind-onshore": _("Wind turbine"), "ABW-hydro-ror": _("Hydro"), "ABW-biomass": _("Biomass"), } SIMULATION_DEMANDS = { + # electricty demands "ABW-electricity-bev_charging": _("BEV"), "ABW-electricity-demand_hh": _("Electricity Household Demand"), "ABW-electricity-demand_cts": _("Electricity CTS Demand"), "ABW-electricity-demand_ind": _("Electricity Industry Demand"), + "electricity_heat_demand_hh": _("Electricity Household Heat Demand"), + "electricity_heat_demand_cts": _("Electricity CTS Heat Demand"), + "electricity_heat_demand_ind": _("Electricity Industry Heat Demand"), + # heat demands + "heat-demand-cts": _("CTS Heat Demand"), + "heat-demand-hh": _("Household Heat Demand"), + "heat-demand-ind": _("Industry Heat Demand"), } SIMULATION_NAME_MAPPING = {} | SIMULATION_RENEWABLES | SIMULATION_DEMANDS diff --git a/digiplan/map/datapackage.py b/digiplan/map/datapackage.py new file mode 100644 index 00000000..b1502ec9 --- /dev/null +++ b/digiplan/map/datapackage.py @@ -0,0 +1,142 @@ +"""Read functionality for digipipe datapackage.""" +import json +from collections import defaultdict +from pathlib import Path +from typing import Optional + +import pandas as pd +from django.conf import settings +from django_oemof.settings import OEMOF_DIR + +from config.settings.base import DATA_DIR + + +def get_employment() -> pd.DataFrame: + """Return employment data.""" + employment_filename = settings.DIGIPIPE_DIR.path("scalars").path("employment.csv") + return pd.read_csv(employment_filename, index_col=0) + + +def get_batteries() -> pd.DataFrame: + """Return battery data.""" + battery_filename = settings.DIGIPIPE_DIR.path("scalars").path("bnetza_mastr_storage_stats_muns.csv") + return pd.read_csv(battery_filename) + + +def get_power_demand(sector: Optional[str] = None) -> dict[str, pd.DataFrame]: + """Return power demand for given sector or all sectors.""" + sectors = (sector,) if sector else ("hh", "cts", "ind") + demand = {} + for sec in sectors: + demand_filename = settings.DIGIPIPE_DIR.path("scalars").path(f"demand_{sec}_power_demand.csv") + demand[sec] = pd.read_csv(demand_filename) + return demand + + +def get_summed_heat_demand_per_municipality( + sector: Optional[str] = None, + distribution: Optional[str] = None, +) -> dict[str, dict[str, pd.DataFrame]]: + """Return heat demand for given sector and distribution.""" + sectors = (sector,) if sector else ("hh", "cts", "ind") + distributions = (distribution,) if distribution else ("cen", "dec") + demand = defaultdict(dict) + for sec in sectors: + for dist in distributions: + demand_filename = settings.DIGIPIPE_DIR.path("scalars").path( + f"demand_{sec}_heat_demand_{dist}.csv", + ) + demand[sec][dist] = pd.read_csv(demand_filename) + return demand + + +def get_heat_demand( + sector: Optional[str] = None, + distribution: Optional[str] = None, +) -> dict[str, dict[str, pd.DataFrame]]: + """Return heat demand for given sector and distribution.""" + sectors = (sector,) if sector else ("hh", "cts", "ind") + distributions = (distribution,) if distribution else ("central", "decentral") + demand = defaultdict(dict) + for sec in sectors: + for dist in distributions: + demand_filename = ( + OEMOF_DIR / settings.OEMOF_SCENARIO / "data" / "sequences" / f"heat_{dist}-demand_{sec}_profile.csv" + ) + demand[sec][dist] = pd.read_csv(demand_filename, sep=";")[f"ABW-heat_{dist}-demand_{sec}-profile"] + return demand + + +def get_thermal_efficiency(component: str) -> float: + """Return thermal efficiency from given component from oemof scenario.""" + component_filename = OEMOF_DIR / settings.OEMOF_SCENARIO / "data" / "elements" / f"{component}.csv" + component_df = pd.read_csv(component_filename, sep=";") + if component_df["type"][0] in ("extraction", "backpressure"): + return float(pd.read_csv(component_filename, sep=";")["thermal_efficiency"][0]) + + if "efficiency" in component_df.columns and isinstance(component_df["efficiency"][0], float): + return component_df["efficiency"][0] + + if "heatpump" in component: + component = "efficiency" + sequence_filename = OEMOF_DIR / settings.OEMOF_SCENARIO / "data" / "sequences" / f"{component}_profile.csv" + return pd.read_csv(sequence_filename, sep=";").iloc[:, 1] + + +def get_potential_values(*, per_municipality: bool = False) -> dict: + """ + Calculate max_values for sliders. + + Parameters + ---------- + per_municipality: bool + If set to True, potentials are not aggregated, but given per municipality + + Returns + ------- + dict + dictionary with each slider / switch and respective max_value + """ + scalars = { + "wind": "potentialarea_wind_area_stats_muns.csv", + "pv_ground": "potentialarea_pv_ground_area_stats_muns.csv", + "pv_roof": "potentialarea_pv_roof_wo_historic_area_stats_muns.csv", + } + + areas = { + "wind": { + "s_w_3": "stp_2018_vreg", + "s_w_4_1": "stp_2027_vr", + "s_w_4_2": "stp_2027_repowering", + "s_w_5_1": "stp_2027_search_area_open_area", + "s_w_5_2": "stp_2027_search_area_forest_area", + }, + "pv_ground": {"s_pv_ff_3": "road_railway_region", "s_pv_ff_4": "agriculture_lfa-off_region"}, + "pv_roof": {"s_pv_d_3": None}, + } + + tech_data = json.load(Path.open(Path(settings.DIGIPIPE_DIR, "scalars/technology_data.json"))) + + potentials = {} + for profile in areas: + path = Path(DATA_DIR, "digipipe/scalars", scalars[profile]) + reader = pd.read_csv(path) + for key, value in areas[profile].items(): + if key == "s_pv_d_3": + pv_roof_potential = reader[ + [f"installable_power_{orient}" for orient in ["south", "east", "west", "flat"]] + ].sum(axis=1) + if per_municipality: + potentials = pv_roof_potential + else: + potentials[key] = pv_roof_potential.sum() + else: + if per_municipality: + potentials[key] = reader[value] + else: + potentials[key] = reader[value].sum() + if profile == "wind": + potentials[key] = potentials[key] * tech_data["power_density"]["wind"] + if profile == "pv_ground": + potentials[key] = potentials[key] * tech_data["power_density"]["pv_ground"] + return potentials diff --git a/digiplan/map/forms.py b/digiplan/map/forms.py index cdeeb630..996a8213 100644 --- a/digiplan/map/forms.py +++ b/digiplan/map/forms.py @@ -1,19 +1,10 @@ from itertools import count # noqa: D100 -from django.db.models import Max, Min -from django.forms import ( - BooleanField, - Form, - IntegerField, - MultipleChoiceField, - MultiValueField, - TextInput, - renderers, -) +from django.forms import BooleanField, Form, IntegerField, TextInput, renderers from django.utils.safestring import mark_safe from django_mapengine import legend -from . import models +from . import charts from .widgets import SwitchWidget @@ -44,47 +35,16 @@ def __init__(self, layer: legend.LegendLayer, *args, **kwargs) -> None: # noqa: super().__init__(*args, **kwargs) self.layer = layer - if hasattr(layer.model, "filters"): - self.has_filters = True - for filter_ in layer.layer.model.filters: - if filter_.type == models.LayerFilterType.Range: - filter_min = layer.layer.model.vector_tiles.aggregate(Min(filter_.name))[f"{filter_.name}__min"] - filter_max = layer.layer.model.vector_tiles.aggregate(Max(filter_.name))[f"{filter_.name}__max"] - self.fields[filter_.name] = MultiValueField( - label=getattr(layer.layer.model, filter_.name).field.verbose_name, - fields=[IntegerField(), IntegerField()], - widget=TextInput( - attrs={ - "class": "js-slider", - "data-type": "double", - "data-min": filter_min, - "data-max": filter_max, - "data-from": filter_min, - "data-to": filter_max, - "data-grid": True, - }, - ), - ) - elif filter_.type == models.LayerFilterType.Dropdown: - filter_values = ( - layer.layer.model.vector_tiles.values_list(filter_.name, flat=True) - .order_by(filter_.name) - .distinct() - ) - self.fields[filter_.name] = MultipleChoiceField( - choices=[(value, value) for value in filter_values], - ) - else: - raise ValueError(f"Unknown filter type '{filter_.type}'") - class PanelForm(TemplateForm): # noqa: D101 - def __init__(self, parameters, **kwargs) -> None: # noqa: D107, ANN001 + def __init__(self, parameters, additional_parameters=None, **kwargs) -> None: # noqa: D107, ANN001 super().__init__(**kwargs) - self.fields = {item["name"]: item["field"] for item in self.generate_fields(parameters)} + self.fields = {item["name"]: item["field"] for item in self.generate_fields(parameters, additional_parameters)} @staticmethod - def generate_fields(parameters): # noqa: ANN001, ANN205, D102 + def generate_fields(parameters, additional_parameters=None): # noqa: ANN001, ANN205, D102 + if additional_parameters is not None: + charts.merge_dicts(parameters, additional_parameters) for name, item in parameters.items(): if item["type"] == "slider": attrs = { @@ -101,7 +61,12 @@ def generate_fields(parameters): # noqa: ANN001, ANN205, D102 if "step" in item: attrs["data-step"] = item["step"] - field = IntegerField(label=item["label"], widget=TextInput(attrs=attrs), help_text=item["tooltip"]) + field = IntegerField( + label=item["label"], + widget=TextInput(attrs=attrs), + help_text=item["tooltip"], + required=item.get("required", True), + ) yield {"name": name, "field": field} elif item["type"] == "switch": attrs = { diff --git a/digiplan/map/hooks.py b/digiplan/map/hooks.py index d7b90c08..72b7a520 100644 --- a/digiplan/map/hooks.py +++ b/digiplan/map/hooks.py @@ -1,10 +1,12 @@ """Module to implement hooks for django-oemof.""" +import logging +import math + import pandas as pd -from django.conf import settings from django.http import HttpRequest -from digiplan.map import config, forms +from digiplan.map import config, datapackage, forms def read_parameters(scenario: str, parameters: dict, request: HttpRequest) -> dict: # noqa: ARG001 @@ -60,17 +62,67 @@ def adapt_electricity_demand(scenario: str, data: dict, request: HttpRequest) -> dict Parameters for oemof with adapted demands """ + del data["s_v_1"] year = "2045" if scenario == "scenario_2045" else "2022" - for sector, slider in (("hh", "s_v_2"), ("cts", "s_v_3"), ("ind", "s_v_4")): - demand_filename = settings.DATA_DIR.path("scenarios").path(f"demand_{sector}_power_demand.csv") - demand = pd.read_csv(demand_filename) + for sector, slider in (("hh", "s_v_3"), ("cts", "s_v_4"), ("ind", "s_v_5")): + demand = datapackage.get_power_demand(sector)[sector] + logging.info(f"Adapting electricity demand at {sector=}.") data[f"ABW-electricity-demand_{sector}"] = {"amount": float(demand[year].sum()) * data.pop(slider) / 100} return data -def adapt_heat_demand(scenario: str, data: dict, request: HttpRequest) -> dict: # noqa: ARG001 +def adapt_heat_capacities(distribution: str, remaining_energy: pd.Series) -> dict: + """Adapt heat settings for remaining energy.""" + # TODO (Hendrik): Read values from datapackage # noqa: TD003 + heat_shares = { + "central": { + "ABW-wood-extchp_central": 0, + "ABW-biogas-bpchp_central": 0, + "ABW-ch4-bpchp_central": 0.5, + "ABW-ch4-extchp_central": 0.5, + "ABW-solar-thermalcollector_central": 0, + "ABW-ch4-boiler_central": 0, + }, + "decentral": { + "ABW-wood-extchp_decentral": 0.15, + "ABW-biogas-bpchp_decentral": 0.15, + "ABW-ch4-bpchp_decentral": 0.15, + "ABW-ch4-extchp_decentral": 0.30, + "ABW-solar-thermalcollector_decentral": 0, + "ABW-ch4-boiler_decentral": 0.15, + "ABW-wood-oven": 0.1, + }, + } + + remaining_energy_sum = remaining_energy.sum() + data = {} + for component, share in heat_shares[distribution].items(): + if share == 0: + continue + efficiency = datapackage.get_thermal_efficiency(component[4:]) + capacity = math.ceil((remaining_energy / efficiency).max() * share) + if capacity == 0: + continue + energy = remaining_energy_sum * share + if "extchp" in component or "bpchp" in component: + parameter = "input_parameters" + energy = energy / efficiency + else: + parameter = "output_parameters" + logging.info(f"Adapting capacity and energy for {component} at {distribution=}.") + data[component] = { + "capacity": capacity, + parameter: { + "summed_min": energy / capacity, + "summed_max": energy / capacity, + }, + } + return data + + +def adapt_heat_settings(scenario: str, data: dict, request: HttpRequest) -> dict: # noqa: ARG001 """ - Read settings and adapt related heat demands. + Read settings and adapt related heat demands and capacities. Parameters ---------- @@ -84,21 +136,82 @@ def adapt_heat_demand(scenario: str, data: dict, request: HttpRequest) -> dict: Returns ------- dict - Parameters for oemof with adapted heat demands + Parameters for oemof with adapted heat demands and capacities """ - year = "2045" if scenario == "scenario_2045" else "2022" - for sector, slider in (("hh", "w_v_3"), ("cts", "w_v_4"), ("ind", "w_v_5")): - percentage = data.pop(slider) - for location in ("central", "decentral"): - demand_filename = settings.DATA_DIR.path("scenarios").path(f"demand_{sector}_heat_demand_{location}.csv") - demand = pd.read_csv(demand_filename) - data[f"ABW-heat_{location}-demand_{sector}"] = { - "amount": float(demand[year].sum()) * percentage / 100, + demand_sliders = {"hh": "w_v_3", "cts": "w_v_4", "ind": "w_v_5"} + hp_sliders = {"hh": "w_d_wp_3", "cts": "w_d_wp_4", "ind": "w_d_wp_5"} + + heat_demand_per_municipality = datapackage.get_summed_heat_demand_per_municipality() + heat_demand = datapackage.get_heat_demand() + + for distribution in ("central", "decentral"): + demand = {} + hp_energy = {} + + # Calculate demands per sector + for sector in ("hh", "cts", "ind"): + summed_demand = int( # Convert to int, otherwise int64 is used + heat_demand_per_municipality[sector][distribution[:3]]["2045"].sum(), + ) + demand[sector] = heat_demand[sector][distribution] * summed_demand + percentage = ( + data.pop(demand_sliders[sector]) if distribution == "decentral" else data.get(demand_sliders[sector]) + ) + # DEMAND + logging.info(f"Adapting heat demand at {distribution=} and {sector=}.") + data[f"ABW-heat_{distribution}-demand_{sector}"] = { + "amount": summed_demand * percentage / 100, } + + # HP contribution per sector: + if distribution == "decentral": + hp_share = data.pop(hp_sliders[sector]) / 100 + hp_energy[sector] = demand[sector] * hp_share + else: + if sector == "hh": # noqa: PLR5501 + hp_share = data.pop("w_z_wp_3") / 100 + hp_energy[sector] = demand[sector] * hp_share + else: + hp_energy[sector] = demand[sector] * 0 + + # HP Capacity and Energies + hp_energy_total = pd.concat(hp_energy.values(), axis=1).sum(axis=1) + hp_energy_sum = hp_energy_total.sum() + capacity = math.ceil(hp_energy_total.max()) + logging.info(f"Adapting capacity and energy for heatpump at {distribution=}.") + data[f"ABW-electricity-heatpump_{distribution}"] = { + "capacity": capacity, + "output_parameters": { + "summed_min": hp_energy_sum / capacity, + "summed_max": hp_energy_sum / capacity, + }, + } + + total_demand = pd.concat(demand.values(), axis=1).sum(axis=1) + remaining_energy = total_demand - hp_energy_total + + # HEAT capacities + data.update(adapt_heat_capacities(distribution, remaining_energy)) + + # STORAGES + storage_sliders = {"decentral": "w_d_s_1", "central": "w_z_s_1"} + avg_demand_per_day = total_demand.sum() / 365 + logging.info(f"Adapting capacity for storage at {distribution=}.") + data[f"ABW-heat_{distribution}-storage"] = { + "capacity": float(avg_demand_per_day * data.pop(storage_sliders[distribution]) / 100), + } + + # Remove unnecessary heat settings + del data["w_v_1"] + del data["w_d_wp_1"] + del data["w_z_wp_1"] + del data["w_d_s_3"] + del data["w_z_s_3"] + return data -def adapt_capacities(scenario: str, data: dict, request: HttpRequest) -> dict: # noqa: ARG001 +def adapt_renewable_capacities(scenario: str, data: dict, request: HttpRequest) -> dict: # noqa: ARG001 """ Read renewable capacities from user input and adapt ES parameters accordingly. @@ -116,26 +229,23 @@ def adapt_capacities(scenario: str, data: dict, request: HttpRequest) -> dict: dict Adapted parameters dict with set up capacities """ + # ELECTRICITY data["ABW-wind-onshore"] = {"capacity": data.pop("s_w_1")} data["ABW-solar-pv_ground"] = {"capacity": data.pop("s_pv_ff_1")} data["ABW-solar-pv_rooftop"] = {"capacity": data.pop("s_pv_d_1")} - # TODO(Hendrik): Slider not yet implemented - # https://github.com/rl-institut-private/digiplan/issues/229 - data["ABW-hydro-ror"] = {"capacity": data.pop("ror")} - data["ABW-electricity-heatpump_decentral"] = {"capacity": data.pop("w_d_wp_1")} - data["ABW-electricity-heatpump_central"] = {"capacity": data.pop("w_z_wp_1")} - - # TODO(Hendrik): Get values either from static file or from sliders - # https://github.com/rl-institut-private/digipipe/issues/119 - data["ABW-biogas-bpchp_central"] = {"capacity": 100} - data["ABW-biogas-bpchp_decentral"] = {"capacity": 100} - data["ABW-wood-extchp_central"] = {"capacity": 100} - data["ABW-wood-extchp_decentral"] = {"capacity": 100} - data["ABW-ch4-bpchp_central"] = {"capacity": 100} - data["ABW-ch4-bpchp_decentral"] = {"capacity": 100} - data["ABW-ch4-extchp_central"] = {"capacity": 100} - data["ABW-ch4-extchp_decentral"] = {"capacity": 100} - data["ABW-ch4-gt"] = {"capacity": 100} - data["ABW-biogas-biogas_upgrading_plant"] = {"capacity": 100} - data["ABW-biomass-biogas_plant"] = {"capacity": 100} + data["ABW-hydro-ror"] = {"capacity": data.pop("s_h_1")} + data["ABW-electricity-large_scale_battery"] = {"capacity": data.pop("s_s_g_1")} + + # Remove unnecessary renewable sliders: + del data["s_w_3"] + del data["s_w_4"] + del data["s_w_4_1"] + del data["s_w_4_2"] + del data["s_w_5"] + del data["s_w_5_1"] + del data["s_w_5_2"] + del data["s_pv_ff_3"] + del data["s_pv_ff_4"] + del data["s_pv_d_3"] + del data["s_pv_d_4"] return data diff --git a/digiplan/map/managers.py b/digiplan/map/managers.py index 72f36748..74f2c6d7 100644 --- a/digiplan/map/managers.py +++ b/digiplan/map/managers.py @@ -1,3 +1,7 @@ +"""Module to hold MVT managers.""" +from typing import Optional + +import django.db.models from django.contrib.gis.db import models from django.contrib.gis.db.models.functions import Transform from django.contrib.gis.geos import Polygon @@ -8,48 +12,74 @@ # pylint: disable=W0223 -class AsMVTGeom(models.functions.GeomOutputGeoFunc): +class AsMVTGeom(models.functions.GeomOutputGeoFunc): # noqa: D101 function = "ST_AsMVTGeom" geom_param_pos = (0, 1) # pylint: disable=W0223 -class X(models.functions.Func): +class X(models.functions.Func): # noqa: D101 function = "ST_X" # pylint: disable=W0223 -class Y(models.functions.Func): +class Y(models.functions.Func): # noqa: D101 function = "ST_Y" class MVTManager(models.Manager): - def __init__(self, *args, geo_col="geom", columns=None, **kwargs): + """Manager to get MVTs from model geometry using postgres MVT abilities.""" + + def __init__( + self, + *args, # noqa: ANN002 + geo_col: str = "geom", + columns: Optional[list[str]] = None, + **kwargs, + ) -> None: + """Init.""" super().__init__(*args, **kwargs) self.geo_col = geo_col self.columns = columns - def get_mvt_query(self, x, y, z, filters=None): + def get_mvt_query(self, x: int, y: int, z: int, filters: Optional[dict] = None) -> tuple: + """Build MVT query; might be overwritten in child class.""" filters = filters or {} return self._build_mvt_query(x, y, z, filters) - def get_columns(self): + def get_columns(self) -> list[str]: + """Return columns to use as features in MVT.""" return self.columns or self._get_non_geom_columns() # pylint: disable=W0613,R0913 - def _filter_query(self, query, x, y, z, filters): + def _filter_query( # noqa: PLR0913 + self, + query: django.db.models.QuerySet, + x: int, # noqa: ARG002 + y: int, # noqa: ARG002 + z: int, # noqa: ARG002 + filters: dict, + ) -> django.db.models.QuerySet: + """ + Filter queryset for given filters. + + Might be overwritten in child class + """ return query.filter(**filters) - def _get_mvt_geom_query(self, x, y, z): + def _get_mvt_geom_query(self, x: int, y: int, z: int) -> django.db.models.QuerySet: + """Intersect bbox from given coordinates and return related MVT.""" bbox = Polygon.from_bbox(tile_edges(x, y, z)) bbox.srid = 4326 - query = self.annotate(mvt_geom=AsMVTGeom(Transform(self.geo_col, 3857), Transform(bbox, 3857), 4096, 0, False)) + query = self.annotate( + mvt_geom=AsMVTGeom(Transform(self.geo_col, 3857), Transform(bbox, 3857), 4096, 0, False), # noqa: FBT003 + ) intersect = {f"{self.geo_col}__intersects": bbox} return query.filter(**intersect) - def _build_mvt_query(self, x, y, z, filters): + def _build_mvt_query(self, x: int, y: int, z: int, filters: dict) -> str: """ - Creates MVT query + Create MVT query. Parameters ---------- @@ -84,9 +114,9 @@ def _build_mvt_query(self, x, y, z, filters): with connection.cursor() as cursor: return cursor.mogrify(sql, params).decode("utf-8") - def _get_non_geom_columns(self): + def _get_non_geom_columns(self) -> list[str]: """ - Retrieves all table columns that are NOT the defined geometry column + Retrieve all table columns that are NOT the defined geometry column. Returns ------- @@ -94,7 +124,7 @@ def _get_non_geom_columns(self): List of column names (excluding geom) """ columns = [] - for field in self.model._meta.get_fields(): + for field in self.model._meta.get_fields(): # noqa: SLF001 if hasattr(field, "get_attname_column"): column_name = field.get_attname_column()[1] if column_name != self.geo_col: @@ -103,41 +133,32 @@ def _get_non_geom_columns(self): class RegionMVTManager(MVTManager): - def get_queryset(self): - return super().get_queryset().annotate(bbox=models.functions.AsGeoJSON(models.functions.Envelope("geom"))) - + """Manager which adds bbox to layer features to better show regions in frontend.""" -class DistrictMVTManager(MVTManager): - def get_queryset(self): - return ( - super() - .get_queryset() - .annotate(bbox=models.functions.AsGeoJSON(models.functions.Envelope("geom"))) - .annotate(state_name=models.F("state__name")) - ) + def get_queryset(self) -> django.db.models.QuerySet: + """Annotate bbox to queryset.""" + return super().get_queryset().annotate(bbox=models.functions.AsGeoJSON(models.functions.Envelope("geom"))) class StaticMVTManager(MVTManager): + """Manager which does nothing?.""" + # pylint: disable=R0913 - def _filter_query(self, query, x, y, z, filters): + def _filter_query( # noqa: PLR0913 + self, + query: django.db.models.QuerySet, + x: int, + y: int, + z: int, + filters: dict, + ) -> django.db.models.QuerySet: query = super()._filter_query(query, x, y, z, filters) return query class LabelMVTManager(MVTManager): - def get_queryset(self): - return super().get_queryset().annotate(geom_label=models.functions.Centroid("geom")) + """Manager which adds centroid of geom to place label.""" - -class ClusterMVTManager(MVTManager): - def get_queryset(self): - return ( - super() - .get_queryset() - .annotate(center=models.functions.Centroid("geom")) - .annotate(state_name=models.F("district__state__name")) - .annotate(district_name=models.F("district__name")) - .annotate( - lat=X("center", output_field=models.DecimalField()), lon=Y("center", output_field=models.DecimalField()) - ) - ) + def get_queryset(self) -> django.db.models.QuerySet: + """Return queryset with added centroid.""" + return super().get_queryset().annotate(geom_label=models.functions.Centroid("geom")) diff --git a/digiplan/map/map_config.py b/digiplan/map/map_config.py index 2e95855d..9f149c63 100644 --- a/digiplan/map/map_config.py +++ b/digiplan/map/map_config.py @@ -1,17 +1,74 @@ """Actual map setup is done here.""" +import dataclasses from django.utils.translation import gettext_lazy as _ from django_mapengine import legend + +@dataclasses.dataclass +class SymbolLegendLayer(legend.LegendLayer): + """Adds symbol field.""" + + symbol: str = "rectangle" + + # TODO(Josi): Add real descriptions for layer info buttons # https://github.com/rl-institut-private/digiplan/issues/249 LEGEND = { _("Renewables"): [ - legend.LegendLayer(_("Wind turbine"), _("Wind turbine layer"), layer_id="wind", color="#6A89CC"), - legend.LegendLayer(_("Roof-mounted PV"), _("PV roof layer"), layer_id="pvroof", color="#FFD660"), - legend.LegendLayer(_("Outdoor PV"), _("Hydro layer"), layer_id="pvground", color="#F6B93B"), - legend.LegendLayer(_("Hydro"), _("Hydro layer"), layer_id="hydro", color="#9CC4D9"), - legend.LegendLayer(_("Biomass"), _("Wind turbine layer"), layer_id="biomass", color="#52C41A"), - legend.LegendLayer(_("Combustion"), _("Wind turbine layer"), layer_id="combustion", color="#1A1A1A"), + SymbolLegendLayer( + _("Wind turbine"), + _("Wind turbine layer"), + layer_id="wind", + color="#6A89CC", + symbol="circle", + ), + SymbolLegendLayer( + _("Roof-mounted PV"), + _("PV roof layer"), + layer_id="pvroof", + color="#FFD660", + symbol="circle", + ), + SymbolLegendLayer(_("Outdoor PV"), _("Hydro layer"), layer_id="pvground", color="#EFAD25", symbol="circle"), + SymbolLegendLayer(_("Hydro"), _("Hydro layer"), layer_id="hydro", color="#A9BDE8", symbol="circle"), + SymbolLegendLayer(_("Biomass"), _("Wind turbine layer"), layer_id="biomass", color="#52C41A", symbol="circle"), + SymbolLegendLayer( + _("Combustion"), + _("Wind turbine layer"), + layer_id="combustion", + color="#E6772E", + symbol="circle", + ), + SymbolLegendLayer(_("GSGK"), _("Wind turbine layer"), layer_id="gsgk", color="#C27BA0", symbol="circle"), + SymbolLegendLayer(_("Storage"), _("Wind turbine layer"), layer_id="storage", color="#8D2D5F", symbol="circle"), + ], + _("Settlements Infrastructure"): [ + legend.LegendLayer(_("Settlement 0m"), _("Aviation layer"), layer_id="settlement-0m"), + legend.LegendLayer(_("Industry"), _("Aviation layer"), layer_id="industry"), + legend.LegendLayer(_("Road Railway 500m"), _("Aviation layer"), layer_id="road_railway-500m_region"), + legend.LegendLayer(_("Road"), _("Aviation layer"), layer_id="road_default"), + legend.LegendLayer(_("Railway"), _("Aviation layer"), layer_id="railway"), + legend.LegendLayer(_("Aviation"), _("Aviation layer"), layer_id="aviation"), + legend.LegendLayer(_("Air Traffic"), _("Air traffic layer"), layer_id="air_traffic"), + legend.LegendLayer(_("Military"), _("Aviation layer"), layer_id="military"), + legend.LegendLayer(_("Grid"), _("Aviation layer"), layer_id="grid"), + ], + _("Nature Landscape"): [ + legend.LegendLayer(_("Nature Conservation Area"), _("layer info"), layer_id="nature_conservation_area"), + legend.LegendLayer(_("Fauna Flora Habitat"), _("layer info"), layer_id="fauna_flora_habitat"), + legend.LegendLayer(_("Special Protection Area"), _("layer info"), layer_id="special_protection_area"), + legend.LegendLayer(_("Biosphere Reserve"), _("Biosphere Reserve layer"), layer_id="biosphere_reserve"), + legend.LegendLayer(_("Landscape Protection Area"), _("layer info"), layer_id="landscape_protection_area"), + legend.LegendLayer(_("Forest"), _("layer info"), layer_id="forest"), + legend.LegendLayer( + _("Drinking Water Protection Area"), + _("layer info"), + layer_id="drinking_water_protection_area", + ), + legend.LegendLayer(_("Water"), _("layer info"), layer_id="water"), + legend.LegendLayer(_("Floodplain"), _("layer info"), layer_id="floodplain"), + legend.LegendLayer(_("Soil Quality High"), _("layer info"), layer_id="soil_quality_high"), + legend.LegendLayer(_("Soil Quality Low"), _("layer info"), layer_id="soil_quality_low"), ], } diff --git a/digiplan/map/migrations/0019_airtraffic.py b/digiplan/map/migrations/0019_airtraffic.py new file mode 100644 index 00000000..74c765e0 --- /dev/null +++ b/digiplan/map/migrations/0019_airtraffic.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2.19 on 2023-06-26 10:12 + +import django.contrib.gis.db.models.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('map', '0018_auto_20230307_1404'), + ] + + operations = [ + migrations.CreateModel( + name='AirTraffic', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + ), + ] diff --git a/digiplan/map/migrations/0020_aviation.py b/digiplan/map/migrations/0020_aviation.py new file mode 100644 index 00000000..3d8fc19c --- /dev/null +++ b/digiplan/map/migrations/0020_aviation.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2.19 on 2023-06-26 10:30 + +import django.contrib.gis.db.models.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('map', '0019_airtraffic'), + ] + + operations = [ + migrations.CreateModel( + name='Aviation', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + ), + ] diff --git a/digiplan/map/migrations/0021_biospherereserve.py b/digiplan/map/migrations/0021_biospherereserve.py new file mode 100644 index 00000000..5e2d9132 --- /dev/null +++ b/digiplan/map/migrations/0021_biospherereserve.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2.19 on 2023-06-26 10:41 + +import django.contrib.gis.db.models.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('map', '0020_aviation'), + ] + + operations = [ + migrations.CreateModel( + name='BiosphereReserve', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + ), + ] diff --git a/digiplan/map/migrations/0022_drinkingwaterarea_faunaflorahabitat_floodplain_forest_grid_gsgk_industry_landscapeprotectionarea_les.py b/digiplan/map/migrations/0022_drinkingwaterarea_faunaflorahabitat_floodplain_forest_grid_gsgk_industry_landscapeprotectionarea_les.py new file mode 100644 index 00000000..c7a1986b --- /dev/null +++ b/digiplan/map/migrations/0022_drinkingwaterarea_faunaflorahabitat_floodplain_forest_grid_gsgk_industry_landscapeprotectionarea_les.py @@ -0,0 +1,282 @@ +# Generated by Django 3.2.19 on 2023-06-26 14:27 + +import django.contrib.gis.db.models.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('map', '0021_biospherereserve'), + ] + + operations = [ + migrations.CreateModel( + name='DrinkingWaterArea', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='FaunaFloraHabitat', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Floodplain', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Forest', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Grid', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='GSGK', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.PointField(srid=4326)), + ('name', models.CharField(max_length=255, null=True)), + ('zip_code', models.CharField(max_length=50, null=True)), + ('geometry_approximated', models.BooleanField()), + ('unit_count', models.BigIntegerField(null=True)), + ('capacity_net', models.FloatField(null=True)), + ('feedin_type', models.CharField(max_length=50, null=True)), + ('mun_id', models.IntegerField(null=True)), + ], + options={ + 'verbose_name': 'GSGK', + 'verbose_name_plural': 'GSGK', + }, + ), + migrations.CreateModel( + name='Industry', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='LandscapeProtectionArea', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='LessFavouredAreasAgricultural', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Military', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='NatureConservationArea', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='PotentialareaPVAgricultureLFAOff', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='PotentialareaPVRoadRailway', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='PotentialareaWindSTP2018Vreg', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='PotentialareaWindSTP2027Repowering', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='PotentialareaWindSTP2027SearchAreaForestArea', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='PotentialareaWindSTP2027SearchAreaOpenArea', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='PotentialareaWindSTP2027VR', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Railway', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Road', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='RoadRailway500m', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Settlement0m', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='SoilQualityHigh', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='SoilQualityLow', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='SpecialProtectionArea', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Water', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/digiplan/map/migrations/0023_storage.py b/digiplan/map/migrations/0023_storage.py new file mode 100644 index 00000000..f58a64ac --- /dev/null +++ b/digiplan/map/migrations/0023_storage.py @@ -0,0 +1,31 @@ +# Generated by Django 3.2.19 on 2023-06-26 15:11 + +import django.contrib.gis.db.models.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('map', '0022_drinkingwaterarea_faunaflorahabitat_floodplain_forest_grid_gsgk_industry_landscapeprotectionarea_les'), + ] + + operations = [ + migrations.CreateModel( + name='Storage', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.PointField(srid=4326)), + ('name', models.CharField(max_length=255, null=True)), + ('zip_code', models.CharField(max_length=50, null=True)), + ('geometry_approximated', models.BooleanField()), + ('unit_count', models.BigIntegerField(null=True)), + ('capacity_net', models.FloatField(null=True)), + ('mun_id', models.IntegerField(null=True)), + ], + options={ + 'verbose_name': 'Storage', + 'verbose_name_plural': 'Storages', + }, + ), + ] diff --git a/digiplan/map/migrations/0024_auto_20230706_1135.py b/digiplan/map/migrations/0024_auto_20230706_1135.py new file mode 100644 index 00000000..d9b24eea --- /dev/null +++ b/digiplan/map/migrations/0024_auto_20230706_1135.py @@ -0,0 +1,54 @@ +# Generated by Django 3.2.20 on 2023-07-06 11:35 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('map', '0023_storage'), + ] + + operations = [ + migrations.AlterField( + model_name='biomass', + name='mun_id', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='map.municipality'), + ), + migrations.AlterField( + model_name='combustion', + name='mun_id', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='map.municipality'), + ), + migrations.AlterField( + model_name='gsgk', + name='mun_id', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='map.municipality'), + ), + migrations.AlterField( + model_name='hydro', + name='mun_id', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='map.municipality'), + ), + migrations.AlterField( + model_name='pvground', + name='mun_id', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='map.municipality'), + ), + migrations.AlterField( + model_name='pvroof', + name='mun_id', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='map.municipality'), + ), + migrations.AlterField( + model_name='storage', + name='mun_id', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='map.municipality'), + ), + migrations.AlterField( + model_name='windturbine', + name='mun_id', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='map.municipality'), + ), + ] diff --git a/digiplan/map/models.py b/digiplan/map/models.py index 0ca68269..f5b368d2 100644 --- a/digiplan/map/models.py +++ b/digiplan/map/models.py @@ -1,7 +1,7 @@ """Digiplan models.""" -from typing import Optional +import pandas as pd from django.contrib.gis.db import models from django.db.models import Sum from django.utils.translation import gettext_lazy as _ @@ -80,139 +80,48 @@ class Meta: # noqa: D106 verbose_name_plural = _("Population") @classmethod - def quantity(cls, year: int, mun_id: Optional[int] = None) -> int: + def quantity_per_municipality_per_year(cls) -> pd.DataFrame: """ - Calculate population in 2022 (either for municipality or for whole region). - - Parameters - ---------- - year: int - Year to filter population for - mun_id: Optional[int] - If given, population for given municipality are calculated. If not, for whole region. + Return population in 2022 per municipality and year. Returns ------- - int - Value of population - """ - if mun_id is not None: - return cls.objects.filter(year=year, municipality__id=mun_id).aggregate(sum=Sum("value"))["sum"] - return cls.objects.filter(year=year).aggregate(sum=Sum("value"))["sum"] - - @classmethod - def population_history(cls, mun_id: int) -> models.QuerySet: - """ - Get chart for population per municipality in different years. - - Parameters - ---------- - mun_id: int - Related municipality - - Returns - ------- - models.QuerySet - containing list of year/value pairs - """ - return cls.objects.filter(municipality__id=mun_id).values_list("year", "value") - - @classmethod - def population_per_municipality(cls) -> dict[int, int]: - """ - Calculate population per municipality. - - Returns - ------- - dict[int, int] - Population per municipality - """ - return {row.municipality_id: row.value for row in cls.objects.filter(year=2022)} - - @classmethod - def density(cls, year: int, mun_id: Optional[int] = None) -> float: - """ - Calculate population denisty in given year per km² (either for municipality or for whole region). - - Parameters - ---------- - year: int - Year to filter population for - mun_id: Optional[int] - If given, population per km² for given municipality are calculated. If not, for whole region. - - Returns - ------- - float - Value of population density - """ - population = cls.quantity(year, mun_id=mun_id) - - if mun_id is not None: - density = population / Municipality.objects.get(pk=mun_id).area - else: - density = population / Municipality.area_whole_region() - return density - - @classmethod - def density_history(cls, mun_id: int) -> dict: + pd.DataFrame + Population per municipality (index) and year (column) """ - Get chart for population density for the given municipality in different years. + population_per_year = ( + pd.DataFrame.from_records(cls.objects.all().values("municipality__id", "year", "value")) # noqa: PD010 + .set_index("municipality__id") + .pivot(columns="year") + ) + population_per_year.columns = population_per_year.columns.droplevel(0) + return population_per_year - Parameters - ---------- - mun_id: int - Related municipality - Returns - ------- - dict - Chart data to use in JS - """ - density_history = [] - population_history = cls.objects.filter(municipality_id=mun_id).values_list("year", "value") +class RenewableModel(models.Model): + """Base class for renewable cluster models.""" - for year, value in population_history: - density = value / Municipality.objects.get(pk=mun_id).area - density_history.append((year, density)) + geom = models.PointField(srid=4326) + name = models.CharField(max_length=255, null=True) + geometry_approximated = models.BooleanField() + unit_count = models.BigIntegerField(null=True) + capacity_net = models.FloatField(null=True) + zip_code = models.CharField(max_length=50, null=True) - return density_history + mun_id = models.ForeignKey(Municipality, on_delete=models.DO_NOTHING, null=True) - @classmethod - def density_per_municipality(cls) -> dict[int, int]: - """ - Calculate population per municipality. + objects = models.Manager() - Returns - ------- - dict[int, int] - Population per municipality - """ - density = cls.population_per_municipality() - for mun_id in density: - density[mun_id] = density[mun_id] / Municipality.objects.get(pk=mun_id).area - return density + class Meta: # noqa: D106 + abstract = True -class WindTurbine(models.Model): +class WindTurbine(RenewableModel): """Model holding wind turbines.""" - geom = models.PointField(srid=4326) - name = models.CharField(max_length=255, null=True) name_park = models.CharField(max_length=255, null=True) - geometry_approximated = models.BooleanField() - unit_count = models.BigIntegerField(null=True) - capacity_net = models.FloatField(null=True) hub_height = models.FloatField(null=True) - zip_code = models.CharField(max_length=50, null=True) rotor_diameter = models.FloatField(null=True) - mun_id = models.IntegerField(null=True) - - objects = models.Manager() - vector_tiles = StaticMVTManager( - geo_col="geom", - columns=["id", "name", "unit_count", "capacity_net", "geometry_approximated", "mun_id"], - ) data_file = "bnetza_mastr_wind_agg_region" layer = "bnetza_mastr_wind" @@ -238,138 +147,24 @@ def __str__(self) -> str: return self.name @classmethod - def quantity(cls, municipality_id: Optional[int] = None) -> int: - """ - Calculate number of windturbines (either for municipality or for whole region). - - Parameters - ---------- - municipality_id: Optional[int] - If given, number of windturbines for given municipality are calculated. If not, for whole region. - - Returns - ------- - int - Sum of windturbines - """ - values = cls.quantity_per_municipality() - windturbines = 0 - - if municipality_id is not None: - windturbines = values[municipality_id] - else: - for index in values: - windturbines += values[index] - return windturbines - - @classmethod - def quantity_per_municipality(cls) -> dict[int, int]: + def quantity_per_municipality(cls) -> pd.DataFrame: """ Calculate number of wind turbines per municipality. Returns ------- - dict[int, int] + dpd.DataFrame wind turbines per municipality """ - windturbines = {} - municipalities = Municipality.objects.all() - - for mun in municipalities: - res_windturbine = cls.objects.filter(mun_id=mun.id).aggregate(Sum("unit_count"))["unit_count__sum"] - if res_windturbine is None: - res_windturbine = 0 - windturbines[mun.id] = res_windturbine - return windturbines - - @classmethod - def wind_turbines_history(cls, municipality_id: int) -> dict: # noqa: ARG003 - """ - Get chart for wind turbines. + queryset = cls.objects.values("mun_id").annotate(units=Sum("unit_count")).values("mun_id", "units") + wind_turbines = pd.DataFrame.from_records(queryset).set_index("mun_id") + return wind_turbines["units"].reindex(Municipality.objects.all().values_list("id", flat=True), fill_value=0) - Parameters - ---------- - municipality_id: int - Related municipality - - Returns - ------- - dict - Chart data to use in JS - """ - return [(2023, 2), (2046, 3), (2050, 4)] - - @classmethod - def quantity_per_square(cls, municipality_id: Optional[int] = None) -> float: - """ - Calculate number of windturbines per km² (either for municipality or for whole region). - Parameters - ---------- - municipality_id: Optional[int] - If given, number of windturbines per km² for given municipality are calculated. If not, for whole region. - - Returns - ------- - float - Sum of windturbines per km² - """ - windturbines = cls.quantity(municipality_id) - - if municipality_id is not None: - return windturbines / Municipality.objects.get(pk=municipality_id).area - return windturbines / Municipality.area_whole_region() - - @classmethod - def wind_turbines_per_area_history(cls, municipality_id: int) -> dict: # noqa: ARG003 - """ - Get chart for wind turbines per km². - - Parameters - ---------- - municipality_id: int - Related municipality - - Returns - ------- - dict - Chart data to use in JS - """ - return [(2023, 2), (2046, 3), (2050, 4)] - - @classmethod - def quantity_per_mun_and_area(cls) -> dict[int, int]: - """ - Calculate windturbines per km² per municipality. - - Returns - ------- - dict[int, int] - windturbines per km² per municipality - """ - windtubines = cls.quantity_per_municipality() - for index in windtubines: - windtubines[index] = windtubines[index] / Municipality.objects.get(pk=index).area - return windtubines - - -class PVroof(models.Model): +class PVroof(RenewableModel): """Model holding PV roof.""" - geom = models.PointField(srid=4326) - name = models.CharField(max_length=255, null=True) - zip_code = models.CharField(max_length=50, null=True) - geometry_approximated = models.BooleanField() - unit_count = models.BigIntegerField(null=True) - capacity_net = models.FloatField(null=True) power_limitation = models.CharField(max_length=50, null=True) - mun_id = models.IntegerField(null=True) - - objects = models.Manager() - vector_tiles = StaticMVTManager( - geo_col="geom", - columns=["id", "name", "unit_count", "capacity_net", "geometry_approximated", "mun_id"], - ) data_file = "bnetza_mastr_pv_roof_agg_region" layer = "bnetza_mastr_pv_roof" @@ -394,23 +189,10 @@ def __str__(self) -> str: return self.name -class PVground(models.Model): +class PVground(RenewableModel): """Model holding PV on ground.""" - geom = models.PointField(srid=4326) - name = models.CharField(max_length=255, null=True) - zip_code = models.CharField(max_length=50, null=True) - geometry_approximated = models.BooleanField() - unit_count = models.BigIntegerField(null=True) - capacity_net = models.FloatField(null=True) power_limitation = models.CharField(max_length=50, null=True) - mun_id = models.IntegerField(null=True) - - objects = models.Manager() - vector_tiles = StaticMVTManager( - geo_col="geom", - columns=["id", "name", "unit_count", "capacity_net", "geometry_approximated", "mun_id"], - ) data_file = "bnetza_mastr_pv_ground_agg_region" layer = "bnetza_mastr_pv_ground" @@ -431,23 +213,10 @@ class Meta: # noqa: D106 verbose_name_plural = _("Outdoor PVs") -class Hydro(models.Model): +class Hydro(RenewableModel): """Hydro model.""" - geom = models.PointField(srid=4326) - name = models.CharField(max_length=255, null=True) - zip_code = models.CharField(max_length=50, null=True) - geometry_approximated = models.BooleanField() - unit_count = models.BigIntegerField(null=True) - capacity_net = models.FloatField(null=True) water_origin = models.CharField(max_length=255, null=True) - mun_id = models.IntegerField(null=True) - - objects = models.Manager() - vector_tiles = StaticMVTManager( - geo_col="geom", - columns=["id", "name", "unit_count", "capacity_net", "geometry_approximated", "mun_id"], - ) data_file = "bnetza_mastr_hydro_agg_region" layer = "bnetza_mastr_hydro" @@ -468,23 +237,10 @@ class Meta: # noqa: D106 verbose_name_plural = _("Hydro") -class Biomass(models.Model): +class Biomass(RenewableModel): """Biomass model.""" - geom = models.PointField(srid=4326) - name = models.CharField(max_length=255, null=True) - zip_code = models.CharField(max_length=50, null=True) - geometry_approximated = models.BooleanField() - unit_count = models.BigIntegerField(null=True) - capacity_net = models.FloatField(null=True) fuel_type = models.CharField(max_length=50, null=True) - mun_id = models.IntegerField(null=True) - - objects = models.Manager() - vector_tiles = StaticMVTManager( - geo_col="geom", - columns=["id", "name", "unit_count", "capacity_net", "geometry_approximated", "mun_id"], - ) data_file = "bnetza_mastr_biomass_agg_region" layer = "bnetza_mastr_biomass" @@ -505,23 +261,10 @@ class Meta: # noqa: D106 verbose_name_plural = _("Biomass") -class Combustion(models.Model): +class Combustion(RenewableModel): """Combustion model.""" - geom = models.PointField(srid=4326) - name = models.CharField(max_length=255, null=True) name_block = models.CharField(max_length=255, null=True) - zip_code = models.CharField(max_length=50, null=True) - geometry_approximated = models.BooleanField() - unit_count = models.BigIntegerField(null=True) - capacity_net = models.FloatField(null=True) - mun_id = models.IntegerField(null=True) - - objects = models.Manager() - vector_tiles = StaticMVTManager( - geo_col="geom", - columns=["id", "name", "unit_count", "capacity_net", "geometry_approximated", "mun_id"], - ) data_file = "bnetza_mastr_combustion_agg_region" layer = "bnetza_mastr_combustion" @@ -542,4 +285,200 @@ class Meta: # noqa: D106 verbose_name_plural = _("Combustion") -RENEWABLES = (WindTurbine, PVroof, PVground, Hydro, Biomass) +class GSGK(RenewableModel): + """GSGK model.""" + + feedin_type = models.CharField(max_length=50, null=True) + + data_file = "bnetza_mastr_gsgk_agg_region" + layer = "bnetza_mastr_gsgk" + + mapping = { + "geom": "POINT", + "name": "name", + "zip_code": "zip_code", + "geometry_approximated": "geometry_approximated", + "unit_count": "unit_count", + "capacity_net": "capacity_net", + "feedin_type": "feedin_type", + "mun_id": "municipality_id", + } + + class Meta: # noqa: D106 + verbose_name = _("GSGK") + verbose_name_plural = _("GSGK") + + +class Storage(RenewableModel): + """Storage model.""" + + data_file = "bnetza_mastr_storage_agg_region" + layer = "bnetza_mastr_storage" + + mapping = { + "geom": "POINT", + "name": "name", + "zip_code": "zip_code", + "geometry_approximated": "geometry_approximated", + "unit_count": "unit_count", + "capacity_net": "capacity_net", + "mun_id": "municipality_id", + } + + class Meta: # noqa: D106 + verbose_name = _("Storage") + verbose_name_plural = _("Storages") + + +class StaticRegionModel(models.Model): + """Base class for static region models.""" + + geom = models.MultiPolygonField(srid=4326) + + objects = models.Manager() + vector_tiles = StaticMVTManager(columns=[]) + + mapping = {"geom": "MULTIPOLYGON"} + + class Meta: # noqa: D106 + abstract = True + + +class AirTraffic(StaticRegionModel): # noqa: D101 + data_file = "air_traffic_control_system_region" + layer = "air_traffic_control_system" + + +class Aviation(StaticRegionModel): # noqa: D101 + data_file = "aviation_region" + layer = "aviation" + + +class BiosphereReserve(StaticRegionModel): # noqa: D101 + data_file = "biosphere_reserve_region" + layer = "biosphere_reserve" + + +class DrinkingWaterArea(StaticRegionModel): # noqa: D101 + data_file = "drinking_water_protection_area_region" + layer = "drinking_water_protection_area" + + +class FaunaFloraHabitat(StaticRegionModel): # noqa: D101 + data_file = "fauna_flora_habitat_region" + layer = "fauna_flora_habitat" + + +class Floodplain(StaticRegionModel): # noqa: D101 + data_file = "floodplain_region" + layer = "floodplain" + + +class Forest(StaticRegionModel): # noqa: D101 + data_file = "forest_region" + layer = "forest" + + +class Grid(StaticRegionModel): # noqa: D101 + data_file = "grid_region" + layer = "grid" + + +class Industry(StaticRegionModel): # noqa: D101 + data_file = "industry_region" + layer = "industry" + + +class LandscapeProtectionArea(StaticRegionModel): # noqa: D101 + data_file = "landscape_protection_area_region" + layer = "landscape_protection_area" + + +class LessFavouredAreasAgricultural(StaticRegionModel): # noqa: D101 + data_file = "less_favoured_areas_agricultural_region" + layer = "less_favoured_areas_agricultural" + + +class Military(StaticRegionModel): # noqa: D101 + data_file = "military_region" + layer = "military" + + +class NatureConservationArea(StaticRegionModel): # noqa: D101 + data_file = "nature_conservation_area_region" + layer = "nature_conservation_area" + + +class Railway(StaticRegionModel): # noqa: D101 + data_file = "railway_region" + layer = "railway" + + +class RoadRailway500m(StaticRegionModel): # noqa: D101 + data_file = "road_railway-500m_region" + layer = "road_railway-500m" + + +class Road(StaticRegionModel): # noqa: D101 + data_file = "road_region" + layer = "road" + + +class Settlement0m(StaticRegionModel): # noqa: D101 + data_file = "settlement-0m_region" + layer = "settlement-0m" + + +class SoilQualityHigh(StaticRegionModel): # noqa: D101 + data_file = "soil_quality_high_region" + layer = "soil_quality_high" + + +class SoilQualityLow(StaticRegionModel): # noqa: D101 + data_file = "soil_quality_low_region" + layer = "soil_quality_low" + + +class SpecialProtectionArea(StaticRegionModel): # noqa: D101 + data_file = "special_protection_area_region" + layer = "special_protection_area" + + +class Water(StaticRegionModel): # noqa: D101 + data_file = "water_region" + layer = "water" + + +class PotentialareaPVAgricultureLFAOff(StaticRegionModel): # noqa: D101 + data_file = "potentialarea_pv_agriculture_lfa-off_region" + layer = "potentialarea_pv_agriculture_lfa-off_region" + + +class PotentialareaPVRoadRailway(StaticRegionModel): # noqa: D101 + data_file = "potentialarea_pv_road_railway_region" + layer = "potentialarea_pv_road_railway_region" + + +class PotentialareaWindSTP2018Vreg(StaticRegionModel): # noqa: D101 + data_file = "potentialarea_wind_stp_2018_vreg" + layer = "potentialarea_wind_stp_2018_vreg" + + +class PotentialareaWindSTP2027Repowering(StaticRegionModel): # noqa: D101 + data_file = "potentialarea_wind_stp_2027_repowering" + layer = "potentialarea_wind_stp_2027_repowering" + + +class PotentialareaWindSTP2027SearchAreaForestArea(StaticRegionModel): # noqa: D101 + data_file = "potentialarea_wind_stp_2027_search_area_forest_area" + layer = "potentialarea_wind_stp_2027_search_area_forest_area" + + +class PotentialareaWindSTP2027SearchAreaOpenArea(StaticRegionModel): # noqa: D101 + data_file = "potentialarea_wind_stp_2027_search_area_open_area" + layer = "potentialarea_wind_stp_2027_search_area_open_area" + + +class PotentialareaWindSTP2027VR(StaticRegionModel): # noqa: D101 + data_file = "potentialarea_wind_stp_2027_vr" + layer = "potentialarea_wind_stp_2027_vr" diff --git a/digiplan/map/popups.py b/digiplan/map/popups.py index e15696b4..62498976 100644 --- a/digiplan/map/popups.py +++ b/digiplan/map/popups.py @@ -1,22 +1,43 @@ """Provide popups for digiplan.""" import abc -import json -import pathlib +from collections import namedtuple from collections.abc import Iterable from typing import Optional, Union +import pandas as pd +from django.db.models import F +from django.utils.translation import gettext_lazy as _ from django_mapengine import popups from django_oemof import results from oemof.tabular.postprocessing import core -from . import calculations, charts, config, models +from . import calculations, charts, models + +Source = namedtuple("Source", ("name", "url")) class RegionPopup(popups.ChartPopup): """Popup containing values for municipality and region in header.""" + lookup: Optional[str] = None + title: str = None + description: str = None unit: str = None + sources: Optional[list[Source]] = None + + def __init__( + self, + lookup: str, + selected_id: int, + map_state: Optional[dict] = None, + template: Optional[str] = None, + ) -> None: + """Initialize parent popup class and adds initialization of detailed data.""" + if self.lookup: + lookup = self.lookup + super().__init__(lookup, selected_id, map_state, template) + self.detailed_data = self.get_detailed_data() def get_context_data(self) -> dict: """ @@ -27,16 +48,15 @@ def get_context_data(self) -> dict: dict context dict including region and municipality data """ - with pathlib.Path(config.POPUPS_DIR.path(f"{self.lookup}.json")).open("r", encoding="utf-8") as data_json: - data = json.load(data_json) - - data["id"] = self.selected_id - data["data"]["region_value"] = self.get_region_value() - data["data"]["municipality_value"] = self.get_municipality_value() - data["data"]["unit"] = self.unit - data["municipality"] = models.Municipality.objects.get(pk=self.selected_id) - - return data + return { + "id": self.selected_id, + "title": self.title, + "description": self.description, + "unit": self.unit, + "region_value": self.get_region_value(), + "municipality_value": self.get_municipality_value(), + "municipality": models.Municipality.objects.get(pk=self.selected_id), + } def get_chart_options(self) -> dict: """ @@ -51,16 +71,29 @@ def get_chart_options(self) -> dict: return charts.create_chart(self.lookup, chart_data) @abc.abstractmethod + def get_detailed_data(self) -> pd.DataFrame: + """ + Return detailed data for each municipality and technology/component. + + Municipality IDs are stored in index, components/technologies/etc. are stored in columns + """ + def get_region_value(self) -> float: - """Must be overwritten.""" + """Return aggregated data of all municipalities and technologies.""" + return self.detailed_data.sum().sum() - @abc.abstractmethod def get_municipality_value(self) -> Optional[float]: - """Must be overwritten.""" + """Return aggregated data for all technologies for given municipality ID.""" + if self.selected_id not in self.detailed_data.index: + return 0 + return self.detailed_data.loc[self.selected_id].sum() - @abc.abstractmethod def get_chart_data(self) -> Iterable: - """Must be overwritten.""" + """Return data for given municipality ID.""" + if self.selected_id not in self.detailed_data.index: + msg = "No chart data available for given ID" + raise KeyError(msg) + return self.detailed_data.loc[self.selected_id] class SimulationPopup(RegionPopup, abc.ABC): @@ -94,107 +127,469 @@ def __init__( self.result = list(results.get_results(self.simulation_id, [self.calculation]).values())[0] +class ClusterPopup(popups.Popup): + """Popup for clusters.""" + + def __init__(self, lookup: str, selected_id: int, **kwargs) -> None: # noqa: ARG002 + """Initialize popup with default cluster template.""" + self.model_lookup = lookup + super().__init__(lookup="cluster", selected_id=selected_id) + + def get_context_data(self) -> dict: + """Return cluster data as context data.""" + model = { + "wind": models.WindTurbine, + "pvroof": models.PVroof, + "pvground": models.PVground, + "hydro": models.Hydro, + "biomass": models.Biomass, + "combustion": models.Combustion, + "gsgk": models.GSGK, + "storage": models.Storage, + }[self.model_lookup] + # TODO(Hendrik Huyskens): Add mapping + # https://github.com/rl-institut-private/digiplan/issues/153 + default_attributes = { + "name": "Name", + "mun_name": "Gemeindename", + "zip_code": "Postleitzahl", + "geometry_approximated": "Geschätzt", + "unit_count": "Anzahl", + "capacity_net": "Kapazität", + } + instance = model.objects.annotate(mun_name=F("mun_id__name")).get(pk=self.selected_id) + return { + "title": model._meta.verbose_name, # noqa: SLF001 + "data": {name: getattr(instance, key) for key, name in default_attributes.items()}, + } + + class CapacityPopup(RegionPopup): """Popup to show capacities.""" - def get_region_value(self) -> float: # noqa: D102 - return calculations.capacity() + lookup = "capacity" - def get_municipality_value(self) -> float: # noqa: D102 - return calculations.capacity(self.selected_id) - - def get_chart_data(self) -> Iterable: # noqa: D102 - return calculations.capacity_comparison(self.selected_id) + def get_detailed_data(self) -> pd.DataFrame: # noqa: D102 + return calculations.capacities_per_municipality() class CapacitySquarePopup(RegionPopup): """Popup to show capacities per km².""" - def get_region_value(self) -> float: # noqa: D102 - return calculations.capacity_square + lookup = "capacity" + + def get_detailed_data(self) -> pd.DataFrame: + """Return capacities per square kilometer.""" + capacities = calculations.capacities_per_municipality() + return calculations.calculate_square_for_value(capacities) - def get_municipality_value(self) -> float: # noqa: D102 - return calculations.capacity_square(self.selected_id) + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Installed capacities per square meter") + chart_options["yAxis"]["name"] = _("MW/km²") + return chart_options - def get_chart_data(self) -> Iterable: # noqa: D102 - return calculations.capacity_square_comparison(self.selected_id) +class EnergyPopup(RegionPopup): + """Popup to show energies.""" -class PopulationPopup(RegionPopup): - """Popup to show Population.""" + lookup = "capacity" + title = _("Energies") + + def get_detailed_data(self) -> pd.DataFrame: # noqa: D102 + return calculations.energies_per_municipality() + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Energies per technology") + chart_options["yAxis"]["name"] = _("GWh") + return chart_options + + +class Energy2045Popup(RegionPopup): + """Popup to show energies.""" + + lookup = "capacity" + title = _("Energies") + + def get_detailed_data(self) -> pd.DataFrame: # noqa: D102 + return calculations.energies_per_municipality_2045(self.map_state["simulation_id"]) + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Energies per technology") + chart_options["yAxis"]["name"] = _("GWh") + chart_options["xAxis"]["data"] = ["Status Quo", "Mein Szenario"] + return chart_options + + def get_chart_data(self) -> Iterable: + """Create capacity chart data for SQ and future scenario.""" + status_quo_data = calculations.energies_per_municipality().loc[self.selected_id] + future_data = super().get_chart_data() + return list(zip(status_quo_data, future_data)) + + +class EnergySharePopup(RegionPopup): + """Popup to show energy shares.""" + + lookup = "capacity" + title = _("Energie Shares") + + def get_detailed_data(self) -> pd.DataFrame: # noqa: D102 + return calculations.energy_shares_per_municipality() + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Energy shares per technology") + chart_options["yAxis"]["name"] = _("%") + return chart_options + + +class EnergyCapitaPopup(RegionPopup): + """Popup to show energy shares per population.""" + + lookup = "capacity" + title = _("Gewonnene Energie pro EW") + + def get_detailed_data(self) -> pd.DataFrame: # noqa: D102 + return calculations.calculate_capita_for_value(calculations.energies_per_municipality()) * 1e3 + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Energy per capita per technology") + chart_options["yAxis"]["name"] = _("MWh") + return chart_options + + +class EnergyCapita2045Popup(RegionPopup): + """Popup to show energies.""" + + lookup = "capacity" + title = _("Gewonnene Energie pro EW") + + def get_detailed_data(self) -> pd.DataFrame: # noqa: D102 + return calculations.calculate_capita_for_value( + calculations.energies_per_municipality_2045(self.map_state["simulation_id"]), + ) + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Energies per capita per technology") + chart_options["yAxis"]["name"] = _("GWh") + chart_options["xAxis"]["data"] = ["Status Quo", "Mein Szenario"] + return chart_options + + def get_chart_data(self) -> Iterable: + """Create capacity chart data for SQ and future scenario.""" + status_quo_data = calculations.calculate_capita_for_value(calculations.energies_per_municipality()).loc[ + self.selected_id + ] + future_data = super().get_chart_data() + return list(zip(status_quo_data, future_data)) + + +class EnergySquarePopup(RegionPopup): + """Popup to show energy shares per km².""" + + lookup = "capacity" + title = _("Gewonnene Energie pro km²") + + def get_detailed_data(self) -> pd.DataFrame: # noqa: D102 + return calculations.calculate_square_for_value(calculations.energies_per_municipality()) * 1e3 + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Energie pro km²") + chart_options["yAxis"]["name"] = _("MWh") + return chart_options - def get_region_value(self) -> float: # noqa: D102 - return models.Population.quantity(2022) - def get_municipality_value(self) -> float: # noqa: D102 - return models.Population.quantity(2022, self.selected_id) +class EnergySquare2045Popup(RegionPopup): + """Popup to show energies.""" + + lookup = "capacity" + title = _("Gewonnene Energie pro km²") + + def get_detailed_data(self) -> pd.DataFrame: # noqa: D102 + return calculations.calculate_square_for_value( + calculations.energies_per_municipality_2045(self.map_state["simulation_id"]), + ) + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Gewonnene Energie pro km²") + chart_options["yAxis"]["name"] = _("MWh") + chart_options["xAxis"]["data"] = ["Status Quo", "Mein Szenario"] + return chart_options def get_chart_data(self) -> Iterable: - return models.Population.population_history(self.selected_id) + """Create capacity chart data for SQ and future scenario.""" + status_quo_data = calculations.calculate_square_for_value(calculations.energies_per_municipality()).loc[ + self.selected_id + ] + future_data = super().get_chart_data() + return list(zip(status_quo_data, future_data)) + + +class PopulationPopup(RegionPopup): + """Popup to show Population.""" + + lookup = "population" + + def get_detailed_data(self) -> pd.DataFrame: + """Return population data.""" + return models.Population.quantity_per_municipality_per_year() class PopulationDensityPopup(RegionPopup): """Popup to show Population Density.""" - def get_region_value(self) -> float: # noqa: D102 - return models.Population.density(2022) + lookup = "population" + + def get_detailed_data(self) -> pd.DataFrame: + """Return population data squared.""" + population = models.Population.quantity_per_municipality_per_year() + return calculations.calculate_square_for_value(population) + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Population density per year") + chart_options["yAxis"]["name"] = _("Pop/km²") + return chart_options + - def get_municipality_value(self) -> float: # noqa: D102 - return models.Population.density(2022, self.selected_id) +class EmployeesPopup(RegionPopup): + """Popup to show employees.""" - def get_chart_data(self) -> Iterable: # noqa: D102 - return models.Population.density_history(self.selected_id) + lookup = "wind_turbines" + title = _("Beschäftigte") + def get_detailed_data(self) -> pd.DataFrame: # noqa: D102 + return calculations.employment_per_municipality() -class RenewableElectricityProductionPopup(SimulationPopup): - """Popup to show renewable electricity production values.""" + def get_chart_data(self) -> Iterable: + """Return single value for employeess in current municipality.""" + return [int(self.detailed_data.loc[self.selected_id])] - unit = "MWh" - calculation = calculations.electricity_production + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Beschäftigte") + chart_options["yAxis"]["name"] = _("") + del chart_options["series"][0]["name"] + return chart_options - def get_region_value(self) -> float: # noqa: D102 - return self.result.sum() / 1000 - def get_municipality_value(self) -> Optional[float]: # noqa: D102 - return None +class CompaniesPopup(RegionPopup): + """Popup to show companies.""" - def get_chart_data(self) -> Iterable: # noqa: D102 - self.result.index = self.result.index.map(lambda x: config.SIMULATION_NAME_MAPPING[x[0]]) - return self.result + lookup = "wind_turbines" + title = _("Betriebe") + + def get_detailed_data(self) -> pd.DataFrame: # noqa: D102 + return calculations.companies_per_municipality() + + def get_chart_data(self) -> Iterable: + """Return single value for companies in current municipality.""" + return [int(self.detailed_data.loc[self.selected_id])] + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Betriebe") + chart_options["yAxis"]["name"] = _("") + del chart_options["series"][0]["name"] + return chart_options class NumberWindturbinesPopup(RegionPopup): """Popup to show the number of wind turbines.""" - def get_region_value(self) -> float: # noqa: D102 - return models.WindTurbine.quantity() + lookup = "wind_turbines" + title = _("Number of wind turbines") + description = _("Description for number of wind turbines") + unit = "" - def get_municipality_value(self) -> float: # noqa: D102 - return models.WindTurbine.quantity(self.selected_id) + def get_detailed_data(self) -> pd.DataFrame: + """Return quantity of wind turbines per municipality (index).""" + return models.WindTurbine.quantity_per_municipality() - def get_chart_data(self) -> Iterable: # noqa: D102 - return models.WindTurbine.wind_turbines_history(self.selected_id) + def get_chart_data(self) -> Iterable: + """Return single value for wind turbines in current municipality.""" + return [int(self.detailed_data.loc[self.selected_id])] class NumberWindturbinesSquarePopup(RegionPopup): """Popup to show the number of wind turbines per km².""" - def get_region_value(self) -> float: # noqa: D102 - return models.WindTurbine.quantity_per_square() + lookup = "wind_turbines" + + def get_detailed_data(self) -> pd.DataFrame: + """Return quantity of wind turbines per municipality (index).""" + wind_turbines = models.WindTurbine.quantity_per_municipality() + return calculations.calculate_square_for_value(wind_turbines) + + def get_chart_options(self) -> dict: + """Overwrite title and unit in chart options.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Wind turbines per square meter") + chart_options["yAxis"]["name"] = _("WT/km²") + return chart_options + + def get_chart_data(self) -> Iterable: + """Return single value for wind turbines in current municipality.""" + return [float(self.detailed_data.loc[self.selected_id])] + + +class ElectricityDemandPopup(RegionPopup): + """Popup to show electricity demand.""" + + lookup = "electricity_demand" + title = _("Strombedarf") + + def get_detailed_data(self) -> pd.DataFrame: # noqa: D102 + return calculations.electricity_demand_per_municipality() + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Strombedarf") + chart_options["yAxis"]["name"] = _("ǴWh") + return chart_options - def get_municipality_value(self) -> float: # noqa: D102 - return models.WindTurbine.quantity_per_square(self.selected_id) - def get_chart_data(self) -> Iterable: # noqa: D102 - return models.WindTurbine.wind_turbines_per_area_history(self.selected_id) +class ElectricityDemandCapitaPopup(RegionPopup): + """Popup to show electricity demand capita.""" + + lookup = "electricity_demand" + title = _("Strombedarf je EinwohnerIn") + + def get_detailed_data(self) -> pd.DataFrame: # noqa: D102 + return calculations.calculate_capita_for_value(calculations.electricity_demand_per_municipality()) + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Strombedarf je EinwohnerIn") + chart_options["yAxis"]["name"] = _("kWh") + return chart_options + + +class HeatDemandPopup(RegionPopup): + """Popup to show heat demand.""" + + lookup = "heat_demand" + title = _("Wärmebedarf") + + def get_detailed_data(self) -> pd.DataFrame: # noqa: D102 + return calculations.electricity_demand_per_municipality() + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Wärmebedarf") + chart_options["yAxis"]["name"] = _("GWh") + return chart_options + + +class HeatDemandCapitaPopup(RegionPopup): + """Popup to show heat demand capita.""" + + lookup = "heat_demand" + title = _("Wärmebedarf je EinwohnerIn") + + def get_detailed_data(self) -> pd.DataFrame: # noqa: D102 + return calculations.calculate_capita_for_value(calculations.electricity_demand_per_municipality()) + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Wärmebedarf je EinwohnerIn") + chart_options["yAxis"]["name"] = _("kWh") + return chart_options + + +class BatteriesPopup(RegionPopup): + """Popup to show battery count.""" + + lookup = "wind_turbines" + title = _("Anzahl Batteriespeicher") + + def get_detailed_data(self) -> pd.DataFrame: # noqa: D102 + return calculations.batteries_per_municipality() + + def get_chart_data(self) -> Iterable: + """Return single value for employeess in current municipality.""" + return [int(self.detailed_data.loc[self.selected_id])] + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Anzahl Batteriespeicher") + chart_options["yAxis"]["name"] = _("#") + del chart_options["series"][0]["name"] + return chart_options + + +class BatteriesCapacityPopup(RegionPopup): + """Popup to show battery count.""" + + lookup = "wind_turbines" + title = _("Kapazität Batteriespeicher") + + def get_detailed_data(self) -> pd.DataFrame: # noqa: D102 + return calculations.battery_capacities_per_municipality() + + def get_chart_data(self) -> Iterable: + """Return single value for employeess in current municipality.""" + return [int(self.detailed_data.loc[self.selected_id])] + + def get_chart_options(self) -> dict: + """Overwrite title and unit.""" + chart_options = super().get_chart_options() + chart_options["title"]["text"] = _("Kapazität Batteriespeicher") + chart_options["yAxis"]["name"] = _("MWh") + del chart_options["series"][0]["name"] + return chart_options POPUPS: dict[str, type(popups.Popup)] = { - "capacity": CapacityPopup, - "capacity_square": CapacitySquarePopup, - "population": PopulationPopup, - "population_density": PopulationDensityPopup, - "renewable_electricity_production": RenewableElectricityProductionPopup, - "wind_turbines": NumberWindturbinesPopup, - "wind_turbines_square": NumberWindturbinesSquarePopup, + "wind": ClusterPopup, + "pvroof": ClusterPopup, + "pvground": ClusterPopup, + "hydro": ClusterPopup, + "biomass": ClusterPopup, + "combustion": ClusterPopup, + "gsgk": ClusterPopup, + "storage": ClusterPopup, + "population_statusquo": PopulationPopup, + "population_density_statusquo": PopulationDensityPopup, + "employees_statusquo": EmployeesPopup, + "companies_statusquo": CompaniesPopup, + "energy_statusquo": EnergyPopup, + "energy_2045": Energy2045Popup, + "energy_share_statusquo": EnergySharePopup, + "energy_capita_statusquo": EnergyCapitaPopup, + "energy_capita_2045": EnergyCapita2045Popup, + "energy_square_statusquo": EnergySquarePopup, + "energy_square_2045": EnergySquare2045Popup, + "capacity_statusquo": CapacityPopup, + "capacity_square_statusquo": CapacitySquarePopup, + "wind_turbines_statusquo": NumberWindturbinesPopup, + "wind_turbines_square_statusquo": NumberWindturbinesSquarePopup, + "electricity_demand_statusquo": ElectricityDemandPopup, + "electricity_demand_capita_statusquo": ElectricityDemandCapitaPopup, + "heat_demand_statusquo": HeatDemandPopup, + "heat_demand_capita_statusquo": HeatDemandCapitaPopup, + "batteries_statusquo": BatteriesPopup, + "batteries_capacity_statusquo": BatteriesCapacityPopup, } diff --git a/digiplan/map/popups/capacity.json b/digiplan/map/popups/capacity.json deleted file mode 100644 index d682ccf2..00000000 --- a/digiplan/map/popups/capacity.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "description": "something about the installed capacity of the renewable energy in this region and / or municipality", - "id": "14", - "data": { - "unit": "MW", - "year": null, - "municipality_value": null, - "region_title": "ABW region", - "region_value": null - }, - "municipality": null, - "sources": [ ], - "title": "installed capacity", - "chart": [] -} diff --git a/digiplan/map/popups/capacity_square.json b/digiplan/map/popups/capacity_square.json deleted file mode 100644 index a515e26a..00000000 --- a/digiplan/map/popups/capacity_square.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "description": "something about the installed capacity of the renewable energy per km² in this region and / or municipality", - "id": "14", - "data": { - "unit": "installed capacity per km²", - "year": null, - "municipality_value": null, - "region_title": "ABW region", - "region_value": null - }, - "municipality": null, - "sources": [ ], - "title": "installed capacity per km²" - } diff --git a/digiplan/map/popups/population.json b/digiplan/map/popups/population.json deleted file mode 100644 index 177262e9..00000000 --- a/digiplan/map/popups/population.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "description": "The population in 2022 of Z\u00f6rbig was 9,311 inhabitants. The entire ABW region had 370,190 inhabitants at that time. The following chart shows a forecast of the population development for the years 2022, 2030, and 2045.", - "id": "14", - "data": { - "unit": "population", - "year": null, - "municipality_value": null, - "region_title": "ABW region", - "region_value": null - }, - "municipality": null, - "sources": [ ], - "title": "population" -} diff --git a/digiplan/map/popups/population_density.json b/digiplan/map/popups/population_density.json deleted file mode 100644 index 8ca0a162..00000000 --- a/digiplan/map/popups/population_density.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "description": "something about the population density in this region and / or municipality", - "id": "14", - "data": { - "unit": "population per km²", - "year": null, - "municipality_value": null, - "region_title": "ABW region", - "region_value": null - }, - "municipality": null, - "sources": [ ], - "title": "Population Density" - } diff --git a/digiplan/map/popups/renewable_electricity_production.json b/digiplan/map/popups/renewable_electricity_production.json deleted file mode 100644 index d39affba..00000000 --- a/digiplan/map/popups/renewable_electricity_production.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "description": "something about the installed capacity of the renewable energy in this region and / or municipality", - "id": "14", - "data": { - "unit": "GWh", - "year": null, - "municipality_value": null, - "region_title": "ABW region", - "region_value": null - }, - "municipality": null, - "sources": [ ], - "title": "Renewable electricity production" -} diff --git a/digiplan/map/popups/wind_turbines.json b/digiplan/map/popups/wind_turbines.json deleted file mode 100644 index d54c1a52..00000000 --- a/digiplan/map/popups/wind_turbines.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "description": "Wind Turbines in this municipality in comparision to the whole region.", - "id": "14", - "data": { - "unit": "wind turbines", - "year": null, - "municipality_value": null, - "region_title": "ABW region", - "region_value": null - }, - "municipality": null, - "sources": [ ], - "title": "wind turbines" -} diff --git a/digiplan/map/popups/wind_turbines_square.json b/digiplan/map/popups/wind_turbines_square.json deleted file mode 100644 index c330360d..00000000 --- a/digiplan/map/popups/wind_turbines_square.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "description": "Wind Turbines per km² in this municipality in comparision to the whole region.", - "id": "14", - "data": { - "unit": "wind turbines", - "year": null, - "municipality_value": null, - "region_title": "ABW region", - "region_value": null - }, - "municipality": null, - "sources": [ ], - "title": "wind turbines" -} diff --git a/digiplan/map/templatetags/helper_tags.py b/digiplan/map/templatetags/helper_tags.py index 7a88a21b..17dd6ef4 100644 --- a/digiplan/map/templatetags/helper_tags.py +++ b/digiplan/map/templatetags/helper_tags.py @@ -1,8 +1,11 @@ +"""Template tags for django templating.""" + from django import template register = template.Library() @register.filter -def dict_lookup_filter(dictionary, key): +def dict_lookup_filter(dictionary: dict, key: str): # noqa: ANN201 + """Lookup key in dictionary.""" return dictionary.get(key, "") diff --git a/digiplan/map/urls.py b/digiplan/map/urls.py index d9b9ccb9..2a3d8b28 100644 --- a/digiplan/map/urls.py +++ b/digiplan/map/urls.py @@ -11,4 +11,5 @@ path("", views.MapGLView.as_view(), name="map"), path("choropleth//", views.get_choropleth, name="choropleth"), path("popup//", views.get_popup, name="popup"), + path("charts", views.get_charts, name="charts"), ] diff --git a/digiplan/map/utils.py b/digiplan/map/utils.py index f1043959..e8b30fd5 100644 --- a/digiplan/map/utils.py +++ b/digiplan/map/utils.py @@ -1,3 +1,5 @@ +"""Module for smaller helper functions.""" + import json import pathlib @@ -6,9 +8,9 @@ from django.template.context import make_context -def get_translated_json_from_file(json_filename: str, request: HttpRequest = None): +def get_translated_json_from_file(json_filename: str, request: HttpRequest = None) -> dict: """ - Renders JSON using translations + Render JSON using translations. Parameters ---------- @@ -28,3 +30,30 @@ def get_translated_json_from_file(json_filename: str, request: HttpRequest = Non c = make_context({}, request) translated_json_string = t.render(c) return json.loads(translated_json_string) + + +def merge_dicts(dict1: dict, dict2: dict) -> dict: + """ + Recursively merge two dictionaries. + + Parameters + ---------- + dict1: dict + Containing the first chart structure. Objects will be first. + dict2: dict + Containing the second chart structure. Objects will be last and + if they have the same name as ones from dict1 they overwrite the ones in first. + + Returns + ------- + dict + First chart modified and appended by second chart. + """ + for key in dict2: + if key in dict1 and isinstance(dict1[key], dict) and isinstance(dict2[key], dict): + merge_dicts(dict1[key], dict2[key]) + elif key in dict1 and isinstance(dict1[key], list) and isinstance(dict2[key], list): + dict1[key].extend(dict2[key]) + else: + dict1[key] = dict2[key] + return dict1 diff --git a/digiplan/map/views.py b/digiplan/map/views.py index 9e3768c9..066af62e 100644 --- a/digiplan/map/views.py +++ b/digiplan/map/views.py @@ -48,10 +48,17 @@ def get_context_data(self, **kwargs) -> dict: context = super().get_context_data(**kwargs) context["panels"] = [ - forms.EnergyPanelForm(utils.get_translated_json_from_file(config.ENERGY_SETTINGS_PANEL_FILE, self.request)), - forms.HeatPanelForm(utils.get_translated_json_from_file(config.HEAT_SETTINGS_PANEL_FILE, self.request)), + forms.EnergyPanelForm( + utils.get_translated_json_from_file(config.ENERGY_SETTINGS_PANEL_FILE, self.request), + additional_parameters=utils.get_translated_json_from_file(config.ADDITIONAL_ENERGY_SETTINGS_FILE), + ), + forms.HeatPanelForm( + utils.get_translated_json_from_file(config.HEAT_SETTINGS_PANEL_FILE, self.request), + additional_parameters=utils.get_translated_json_from_file(config.ADDITIONAL_HEAT_SETTINGS_FILE), + ), forms.TrafficPanelForm( utils.get_translated_json_from_file(config.TRAFFIC_SETTINGS_PANEL_FILE, self.request), + additional_parameters=utils.get_translated_json_from_file(config.ADDITIONAL_TRAFFIC_SETTINGS_FILE), ), ] @@ -68,14 +75,16 @@ def get_context_data(self, **kwargs) -> dict: } context["sources"] = categorized_sources context["store_cold_init"] = config.STORE_COLD_INIT - context["detailed_overview"] = charts.create_chart("detailed_overview") - context["ghg_overview"] = charts.create_chart("ghg_overview") - context["electricity_overview"] = charts.create_chart("electricity_overview") - context["electricity_ghg"] = charts.create_chart("electricity_ghg") - context["mobility_overview"] = charts.create_chart("mobility_overview") - context["mobility_ghg"] = charts.create_chart("mobility_ghg") - context["overview_heat"] = charts.create_chart("overview_heat") - context["decentralized_centralized_heat"] = charts.create_chart("decentralized_centralized_heat") + context["detailed_overview"] = charts.Chart("detailed_overview").render() + context["ghg_overview"] = charts.Chart("ghg_overview").render() + context["electricity_overview"] = charts.Chart("electricity_overview").render() + context["electricity_ghg"] = charts.Chart("electricity_ghg").render() + context["mobility_overview"] = charts.Chart("mobility_overview").render() + context["mobility_ghg"] = charts.Chart("mobility_ghg").render() + context["overview_heat"] = charts.Chart("overview_heat").render() + context["decentralized_centralized_heat"] = charts.Chart("decentralized_centralized_heat").render() + context["ghg_history"] = charts.Chart("ghg_history").render() + context["ghg_reduction"] = charts.Chart("ghg_reduction").render() return context @@ -99,7 +108,7 @@ def get_popup(request: HttpRequest, lookup: str, region: int) -> response.JsonRe containing HTML to render popup and chart options to be used in E-Chart. """ map_state = request.GET.dict() - popup = popups.POPUPS[lookup](lookup, region, map_state) + popup = popups.POPUPS[lookup](lookup, region, map_state=map_state) return popup.render() @@ -124,3 +133,27 @@ def get_choropleth(request: HttpRequest, lookup: str, layer_id: str) -> response """ map_state = request.GET.dict() return choropleths.CHOROPLETHS[lookup](lookup, map_state) + + +def get_charts(request: HttpRequest) -> response.JsonResponse: + """ + Return all result charts at once. + + Parameters + ---------- + request: HttpRequest + request holding simulation ID in map_state dict + + Returns + ------- + JsonResponse + holding dict with `div_id` as keys and chart options as values. + `div_id` is used in frontend to detect chart container. + """ + lookups = request.GET.getlist("charts[]") + simulation_id = None + if "map_state[simulation_id]" in request.GET.dict(): + simulation_id = int(request.GET.dict()["map_state[simulation_id]"]) + return response.JsonResponse( + {lookup: charts.CHARTS[lookup](simulation_id=simulation_id).render() for lookup in lookups}, + ) diff --git a/digiplan/map/widgets.py b/digiplan/map/widgets.py index c42d20a8..af0a1993 100644 --- a/digiplan/map/widgets.py +++ b/digiplan/map/widgets.py @@ -1,67 +1,15 @@ +"""Module holds widgets for digiplan.""" + from django.forms.widgets import Widget -from django.utils.safestring import mark_safe class SliderWidget(Widget): + """Widget to render sliders.""" + template_name = "widgets/slider.html" class SwitchWidget(Widget): - template_name = "widgets/switch.html" - - -# pylint: disable=R0903 -class JsonWidget: - def __init__(self, json): - self.json = json - - def __convert_to_html(self, data, level=0): - html = "" - if isinstance(data, dict): - html += ( - f'
' - if level > 0 - else "
" - ) - for key, value in data.items(): - html += f"{key}: {self.__convert_to_html(value, level+1)}" - html += "
" - elif isinstance(data, list): - html += f'
' - for item in data: - html += f"{self.__convert_to_html(item, level+1)}" - html += "
" - else: - html += f"{data}
" - return html - - def render(self): - header = "" - if self.json["title"] != "": - header += f'

{self.json["title"]}

' - if self.json["description"] != "": - header += f'

{self.json["description"]}

' - return mark_safe(header + self.__convert_to_html(data=self.json)) # noqa: S703,S308 + """Widget to render switches.""" - -class BoxWidget(Widget): - template_name = "widgets/box.html" - - def __init__(self, attrs=None): - default_attrs = {"class": "box-widget"} - if attrs: - default_attrs.update(attrs) - super().__init__(default_attrs) - - -class TitleWidget(Widget): - template_name = "widgets/title.html" - - def __init__(self, attrs=None): - default_attrs = {"class": "title-widget"} - if attrs: - default_attrs.update(attrs) - super().__init__(default_attrs) + template_name = "widgets/switch.html" diff --git a/digiplan/static/config/energy_settings_panel.json b/digiplan/static/config/energy_settings_panel.json index ef31e9a7..32e0dee6 100644 --- a/digiplan/static/config/energy_settings_panel.json +++ b/digiplan/static/config/energy_settings_panel.json @@ -37,23 +37,33 @@ "tooltip": "{% trans 'Priority areas repowering.' %}", "type": "switch" }, - "s_w_5": { + "s_w_5": { "class": "js-sidepanel-switch", "label": "{% trans 'Free extension in the search area.' %}", "tooltip": "{% trans 'Free extension in the search area.' %}", "type": "switch" }, "s_w_5_1": { - "class": "js-sidepanel-switch", + "class": "js-slider", "label": "{% trans 'Use of open country search area.' %}", "tooltip": "{% trans 'Use of open country search area.' %}", - "type": "switch" + "max": 100, + "min": 0, + "start": 0, + "step": 5, + "type": "slider", + "required": false }, "s_w_5_2": { - "class": "js-sidepanel-switch", + "class": "js-slider", "label": "{% trans 'Use of forest search space.' %}", "tooltip": "{% trans 'Use of forest search space.' %}", - "type": "switch" + "max": 100, + "min": 0, + "start": 0, + "step": 5, + "type": "slider", + "required": false }, "s_pv_ff_1": { "class": "js-slider js-slider-panel js-power-mix", @@ -135,18 +145,6 @@ "tooltip": "{% trans 'Run-of-river power plants' %}", "type": "slider" }, - "s_b_1": { - "class": "js-slider js-slider-panel js-power-mix", - "color": "#FA9FB5", - "label": "{% trans 'Bioenergy (MW)' %}", - "max": 30, - "min": 0, - "start": 5, - "status_quo": 15, - "step": 5, - "tooltip": "{% trans 'Biomass and biogas plants' %}", - "type": "slider" - }, "s_v_1": { "class": "js-slider js-slider-panel", "grid": false, @@ -193,13 +191,13 @@ }, "s_s_g_1": { "class": "js-slider js-slider-panel js-power-mix", - "label": "{% trans 'Large scale batteries (GWh)' %}", + "label": "{% trans 'Large scale batteries (MWh)' %}", "max": 20, "min": 0, "start": 2, "status_quo": 3, "step": 0.1, - "tooltip": "{% trans 'Large scale batteries (GWh)' %}", + "tooltip": "{% trans 'Large scale batteries (MWh)' %}", "type": "slider", "sidepanel": true }, diff --git a/digiplan/static/config/heat_settings_panel.json b/digiplan/static/config/heat_settings_panel.json index 575d8228..e9768828 100644 --- a/digiplan/static/config/heat_settings_panel.json +++ b/digiplan/static/config/heat_settings_panel.json @@ -60,7 +60,7 @@ }, "w_z_wp_3": { "class": "js-slider", - "label": "{% trans 'Households (%)' %}", + "label": "{% trans 'Share (%)' %}", "max": 200, "min": 50, "start": 50, diff --git a/digiplan/static/config/layer_styles.json b/digiplan/static/config/layer_styles.json index 46a66e99..ef438143 100644 --- a/digiplan/static/config/layer_styles.json +++ b/digiplan/static/config/layer_styles.json @@ -158,7 +158,7 @@ "type": "circle", "filter": ["has", "point_count"], "paint": { - "circle-color": "#F6B93B", + "circle-color": "#EFAD25", "circle-radius": [ "step", ["get", "point_count"], @@ -195,7 +195,7 @@ "type": "circle", "filter": ["has", "point_count"], "paint": { - "circle-color": "#9CC4D9", + "circle-color": "#A9BDE8", "circle-radius": [ "step", ["get", "point_count"], @@ -253,6 +253,86 @@ "text-size": 12 } }, + "gsgk": { + "type": "symbol", + "filter": ["!", ["has", "point_count"]], + "layout": { + "icon-image": "gsgk", + "icon-size": 0.4, + "icon-allow-overlap": true + }, + "paint": { + "icon-color": "black" + } + }, + "gsgk_cluster": { + "type": "circle", + "filter": ["has", "point_count"], + "paint": { + "circle-color": "#C27BA0", + "circle-radius": [ + "step", + ["get", "point_count"], + 20, + 15, + 30, + 50, + 40 + ] + } + }, + "gsgk_cluster_count": { + "type": "symbol", + "filter": ["has", "point_count"], + "layout": { + "text-field": "{point_count_abbreviated}", + "text-font": ["DIN Offc Pro Medium", "Arial Unicode MS Bold"], + "text-size": 12 + }, + "paint": { + "text-color": "white" + } + }, + "storage": { + "type": "symbol", + "filter": ["!", ["has", "point_count"]], + "layout": { + "icon-image": "storage", + "icon-size": 0.4, + "icon-allow-overlap": true + }, + "paint": { + "icon-color": "black" + } + }, + "storage_cluster": { + "type": "circle", + "filter": ["has", "point_count"], + "paint": { + "circle-color": "#8D2D5F", + "circle-radius": [ + "step", + ["get", "point_count"], + 20, + 15, + 30, + 50, + 40 + ] + } + }, + "storage_cluster_count": { + "type": "symbol", + "filter": ["has", "point_count"], + "layout": { + "text-field": "{point_count_abbreviated}", + "text-font": ["DIN Offc Pro Medium", "Arial Unicode MS Bold"], + "text-size": 12 + }, + "paint": { + "text-color": "white" + } + }, "combustion": { "type": "symbol", "filter": ["!", ["has", "point_count"]], @@ -269,7 +349,7 @@ "type": "circle", "filter": ["has", "point_count"], "paint": { - "circle-color": "#1A1A1A", + "circle-color": "#E6772E", "circle-radius": [ "step", ["get", "point_count"], @@ -318,5 +398,173 @@ ], "fill-opacity": 0.8 } + }, + "potentialarea_pv_road_railway_region": { + "type": "fill", + "paint": { + "fill-color": "#ffd744" + } + }, + "potentialarea_pv_agriculture_lfa-off_region": { + "type": "fill", + "paint": { + "fill-color": "#c19800" + } + }, + "potentialarea_wind_stp_2018_vreg": { + "type": "fill", + "paint": { + "fill-color": "#6A89CC" + } + }, + "potentialarea_wind_stp_2027_vr": { + "type": "fill", + "paint": { + "fill-color": "#6A89CC" + } + }, + "potentialarea_wind_stp_2027_repowering": { + "type": "fill", + "paint": { + "fill-color": "#273f73" + } + }, + "potentialarea_wind_stp_2027_search_area_open_area": { + "type": "fill", + "paint": { + "fill-color": "#6A89CC" + } + }, + "potentialarea_wind_stp_2027_search_area_forest_area": { + "type": "fill", + "paint": { + "fill-color": "#273f73" + } + }, + "air_traffic": { + "type": "fill", + "paint": { + "fill-color": "#969696" + } + }, + "aviation": { + "type": "fill", + "paint": { + "fill-color": "#CCCCCC" + } + }, + "biosphere_reserve": { + "type": "fill", + "paint": { + "fill-color": "#238443" + } + }, + "drinking_water_protection_area": { + "type": "fill", + "paint": { + "fill-color": "#6BAED6" + } + }, + "fauna_flora_habitat": { + "type": "fill", + "paint": { + "fill-color": "#78C679" + } + }, + "floodplain": { + "type": "fill", + "paint": { + "fill-color": "#08306B" + } + }, + "forest": { + "type": "fill", + "paint": { + "fill-color": "#004529" + } + }, + "grid": { + "type": "fill", + "paint": { + "fill-color": "#252525" + } + }, + "industry": { + "type": "fill", + "paint": { + "fill-color": "#BCBDDC" + } + }, + "landscape_protection_area": { + "type": "fill", + "paint": { + "fill-color": "#006837" + } + }, + "less_favoured_areas_agricultural": { + "type": "fill", + "paint": { + "fill-color": "#66c2a4" + } + }, + "military": { + "type": "fill", + "paint": { + "fill-color": "#636363" + } + }, + "nature_conservation_area": { + "type": "fill", + "paint": { + "fill-color": "#ADDD8E" + } + }, + "railway": { + "type": "fill", + "paint": { + "fill-color": "#54278F" + } + }, + "road_default": { + "type": "fill", + "paint": { + "fill-color": "#756BB1" + } + }, + "road_railway-500m_region": { + "type": "fill", + "paint": { + "fill-color": "#9E9AC8" + } + }, + "settlement-0m": { + "type": "fill", + "paint": { + "fill-color": "#DADAEB" + } + }, + "soil_quality_low": { + "type": "fill", + "paint": { + "fill-color": "#A63603" + } + }, + "soil_quality_high": { + "type": "fill", + "paint": { + "fill-color": "#FD8D3C" + } + }, + "special_protection_area": { + "type": "fill", + "paint": { + "fill-color": "#41AB5D" + } + }, + "water": { + "type": "fill", + "paint": { + "fill-color": "#2171B5" + } } } diff --git a/digiplan/static/images/icons/i_GSGK.svg b/digiplan/static/images/icons/i_GSGK.svg new file mode 100644 index 00000000..3ec31cd7 --- /dev/null +++ b/digiplan/static/images/icons/i_GSGK.svg @@ -0,0 +1,10 @@ + + + + + + + diff --git a/digiplan/static/images/icons/i_battery.svg b/digiplan/static/images/icons/i_battery.svg new file mode 100644 index 00000000..df1c8f74 --- /dev/null +++ b/digiplan/static/images/icons/i_battery.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/digiplan/static/images/icons/map_battery.png b/digiplan/static/images/icons/map_battery.png new file mode 100644 index 00000000..e84ced97 Binary files /dev/null and b/digiplan/static/images/icons/map_battery.png differ diff --git a/digiplan/static/images/icons/map_gsgk.png b/digiplan/static/images/icons/map_gsgk.png new file mode 100644 index 00000000..4699507a Binary files /dev/null and b/digiplan/static/images/icons/map_gsgk.png differ diff --git a/digiplan/static/images/map-outdoor-pv.png b/digiplan/static/images/map-outdoor-pv.png new file mode 100644 index 00000000..54b15811 Binary files /dev/null and b/digiplan/static/images/map-outdoor-pv.png differ diff --git a/digiplan/static/images/map-roof-pv.png b/digiplan/static/images/map-roof-pv.png new file mode 100644 index 00000000..1b2f6c33 Binary files /dev/null and b/digiplan/static/images/map-roof-pv.png differ diff --git a/digiplan/static/images/map-wind.png b/digiplan/static/images/map-wind.png new file mode 100644 index 00000000..d8d87f81 Binary files /dev/null and b/digiplan/static/images/map-wind.png differ diff --git a/digiplan/static/images/map_clusters.png b/digiplan/static/images/map_clusters.png new file mode 100644 index 00000000..08172d46 Binary files /dev/null and b/digiplan/static/images/map_clusters.png differ diff --git a/digiplan/static/images/settings.png b/digiplan/static/images/settings.png new file mode 100644 index 00000000..0ca99d9d Binary files /dev/null and b/digiplan/static/images/settings.png differ diff --git a/digiplan/static/images/sidebar.png b/digiplan/static/images/sidebar.png new file mode 100644 index 00000000..cdd518cf Binary files /dev/null and b/digiplan/static/images/sidebar.png differ diff --git a/digiplan/static/js/charts.js b/digiplan/static/js/charts.js index ea060a65..09e036eb 100644 --- a/digiplan/static/js/charts.js +++ b/digiplan/static/js/charts.js @@ -8,12 +8,6 @@ const renewable_share_scenario_chart = echarts.init(renewable_share_scenario_div const co2_emissions_scenario_div = document.getElementById("co2_emissions_scenario_chart"); const co2_emissions_scenario_chart = echarts.init(co2_emissions_scenario_div); -// Sidebar, initialize charts -const chart3Element = document.getElementById("chart3"); -const chart3 = echarts.init(chart3Element); -const chart4Element = document.getElementById("chart4"); -const chart4 = echarts.init(chart4Element); - // Results view, initiliaze charts const detailed_overview_chart = echarts.init(document.getElementById("detailed_overview_chart")); const ghg_overview_chart = echarts.init(document.getElementById("ghg_overview_chart")); @@ -23,7 +17,8 @@ const mobility_overview_chart = echarts.init(document.getElementById("mobility_o const mobility_THG_chart = echarts.init(document.getElementById("mobility_THG_chart")); const overview_heat_chart = echarts.init(document.getElementById("overview_heat_chart")); const decentralized_centralized_heat_chart = echarts.init(document.getElementById("decentralized_centralized_heat_chart")); - +const ghg_history_chart = echarts.init(document.getElementById("ghg_history_chart")); +const ghg_reduction_chart = echarts.init(document.getElementById("ghg_reduction_chart")); PubSub.subscribe(eventTopics.MENU_CHANGED, resizeCharts); @@ -31,7 +26,7 @@ PubSub.subscribe(eventTopics.MENU_CHANGED, resizeCharts); const chart_tooltip = { trigger: 'axis', axisPointer: { - type: 'shadow' + type: 'shadow' } }; const chart_bar_width_sm = 16; @@ -52,20 +47,20 @@ const chart_grid_results = { }; const chart_text_style = { fontFamily: "Roboto", - fontSize: 14, - fontWeight: 300, - color: '#002C50' + fontSize: 10, + //fontWeight: 300, + //color: '#002C50' }; const chart_legend = { show: true, - bottom: '15', - itemWidth: 14, - itemHeight: 14 + bottom: '0', + itemWidth: 10, + itemHeight: 10 }; // Goal variables -const renewable_share_goal_value = 90; -const co2_emissions_goal_value = 30; +// const renewable_share_goal_value = 90; +// const co2_emissions_goal_value = 30; // CHARTS const renewable_share_goal = { @@ -74,10 +69,11 @@ const renewable_share_goal = { textStyle: chart_text_style, xAxis: { type: 'category', - data: ['2021', '2045'], + data: ['2021', 'Szenario'], axisTick: { - show: false - } + show: false, + }, + axisLabel: {fontSize: 9}, //, rotate: 20}, }, yAxis: { show: true, @@ -92,7 +88,7 @@ const renewable_share_goal = { { value: 30, itemStyle: { - color: '#C3D1DC' + color: '#D8E2E7' } }, { @@ -102,20 +98,20 @@ const renewable_share_goal = { } }, ], - markLine: { - silent: true, - lineStyle: { - color: '#00BC8C', - type: 'solid' - }, - symbol: 'none', - data: [{ - yAxis: renewable_share_goal_value, - label: { - show: false - } - }] - } + // markLine: { + // silent: true, + // lineStyle: { + // color: '#06DFA7', + // type: 'solid' + // }, + // symbol: 'none', + // data: [{ + // yAxis: renewable_share_goal_value, + // label: { + // show: false + // } + // }] + // } }, ], }; @@ -124,12 +120,14 @@ const co2_emissions_goal = { grid: chart_grid_goal, tooltip: chart_tooltip, textStyle: chart_text_style, + legend: chart_legend, xAxis: { type: 'category', - data: ['2021', '2045'], + data: ['Szenario'], axisTick: { show: false - } + }, + axisLabel: {fontSize: 9}, //, rotate: 20}, }, yAxis: { show: true, @@ -139,36 +137,34 @@ const co2_emissions_goal = { series: [ { type: 'bar', + name: 'Regional', + stack: 'reduc', + color: '#06DFA7', barWidth: chart_bar_width_sm, - data: [ - { - value: 90, - itemStyle: { - color: '#C3D1DC' - } - }, - { - value: 30, - itemStyle: { - color: '#E6A100' - } - }, - ], - markLine: { - silent: true, - lineStyle: { - color: '#BE880B', - type: 'solid' - }, - symbol: 'none', - data: [{ - yAxis: co2_emissions_goal_value, - label: { - show: false - } - }] - } + data: [50], }, + { + type: 'bar', + name: 'Import', + stack: 'reduc', + color: '#E8986B', + barWidth: chart_bar_width_sm, + data: [20], + }, + // markLine: { + // silent: true, + // lineStyle: { + // color: '#E8986B', + // type: 'solid' + // }, + // symbol: 'none', + // data: [{ + // yAxis: co2_emissions_goal_value, + // label: { + // show: false + // } + // }] + // } ], }; @@ -178,10 +174,11 @@ const renewable_share_scenario = { textStyle: chart_text_style, xAxis: { type: 'category', - data: ['2021', '2045'], + data: ['2021', 'Szenario'], axisTick: { - show: false - } + show: false, + }, + axisLabel: {fontSize: 9}, //, rotate: 20}, }, yAxis: { show: true, @@ -196,7 +193,7 @@ const renewable_share_scenario = { { value: 30, itemStyle: { - color: '#C3D1DC' + color: '#D8E2E7' } }, { @@ -206,20 +203,20 @@ const renewable_share_scenario = { } }, ], - markLine: { - silent: true, - lineStyle: { - color: '#00BC8C', - type: 'solid' - }, - symbol: 'none', - data: [{ - yAxis: renewable_share_goal_value, - label: { - show: false - } - }] - } + // markLine: { + // silent: true, + // lineStyle: { + // color: '#06DFA7', + // type: 'solid' + // }, + // symbol: 'none', + // data: [{ + // yAxis: renewable_share_goal_value, + // label: { + // show: false + // } + // }] + // } }, ], }; @@ -228,12 +225,14 @@ const co2_emissions_scenario = { grid: chart_grid_goal, tooltip: chart_tooltip, textStyle: chart_text_style, + legend: chart_legend, xAxis: { type: 'category', - data: ['2021', '2045'], + data: ['Szenario'], axisTick: { show: false - } + }, + axisLabel: {fontSize: 9}, //, rotate: 20}, }, yAxis: { show: true, @@ -243,90 +242,35 @@ const co2_emissions_scenario = { series: [ { type: 'bar', + name: 'Regional', + stack: 'reduc', + color: '#06DFA7', barWidth: chart_bar_width_sm, - data: [ - { - value: 90, - itemStyle: { - color: '#C3D1DC' - } - }, - { - value: 30, - itemStyle: { - color: '#E6A100' - } - }, - ], - markLine: { - silent: true, - lineStyle: { - color: '#BE880B', - type: 'solid' - }, - symbol: 'none', - data: [{ - yAxis: co2_emissions_goal_value, - label: { - show: false - } - }] - } + data: [50], }, - ], -}; - -const option = { - textStyle: chart_text_style, - title: { - text: 'Anteil Erneuerbare \nEnergien (%)', - }, - tooltip: { - trigger: 'axis' - }, - legend: { - bottom: 10, - data: ['2021', '2035'] - }, - toolbox: { - show: false - }, - calculable: true, - xAxis: [ { - type: 'category', - data: ['Jahre'], - axisTick: { - show: false - } - } - ], - yAxis: [ - { - type: 'value', - max: 100 - } - ], - series: [ - { - name: '2021', type: 'bar', - color: '#C3D1DC', - barWidth: '32', - data: [ - 60 - ], + name: 'Import', + stack: 'reduc', + color: '#E8986B', + barWidth: chart_bar_width_sm, + data: [20], }, - { - name: '2035', - type: 'bar', - color: '#06DFA7', - barWidth: '32', - data: [ - 80 - ] - } - ] + // markLine: { + // silent: true, + // lineStyle: { + // color: '#E8986B', + // type: 'solid' + // }, + // symbol: 'none', + // data: [{ + // yAxis: co2_emissions_goal_value, + // label: { + // show: false + // } + // }] + // } + ], }; // get options for result view charts @@ -338,6 +282,8 @@ const mobility_overview_option = JSON.parse(document.getElementById("mobility_ov const mobility_ghg_option = JSON.parse(document.getElementById("mobility_ghg").textContent); const overview_heat_option = JSON.parse(document.getElementById("overview_heat").textContent); const decentralized_centralized_heat_option = JSON.parse(document.getElementById("decentralized_centralized_heat").textContent); +const ghg_history_option = JSON.parse(document.getElementById("ghg_history").textContent); +const ghg_reduction_option = JSON.parse(document.getElementById("ghg_reduction").textContent); function resizeCharts() { setTimeout(function () { @@ -345,8 +291,6 @@ function resizeCharts() { co2_emissions_goal_chart.resize(); renewable_share_scenario_chart.resize(); co2_emissions_scenario_chart.resize(); - chart3.resize(); - chart4.resize(); detailed_overview_chart.resize(); ghg_overview_chart.resize(); electricity_overview_chart.resize(); @@ -355,6 +299,8 @@ function resizeCharts() { mobility_THG_chart.resize(); overview_heat_chart.resize(); decentralized_centralized_heat_chart.resize(); + ghg_history_chart.resize(); + ghg_reduction_chart.resize(); }, 200); } @@ -364,10 +310,6 @@ co2_emissions_goal_chart.setOption(co2_emissions_goal); renewable_share_scenario_chart.setOption(renewable_share_scenario); co2_emissions_scenario_chart.setOption(co2_emissions_scenario); -// Sidebar, setOptions -chart3.setOption(option); -chart4.setOption(option); - // Results, setOptions detailed_overview_chart.setOption(detailed_overview_option); ghg_overview_chart.setOption(ghg_overview_option); @@ -377,6 +319,8 @@ mobility_overview_chart.setOption(mobility_overview_option); mobility_THG_chart.setOption(mobility_ghg_option); overview_heat_chart.setOption(overview_heat_option); decentralized_centralized_heat_chart.setOption(decentralized_centralized_heat_option); +ghg_history_chart.setOption(ghg_history_option); +ghg_reduction_chart.setOption(ghg_reduction_option); resizeCharts(); @@ -386,6 +330,13 @@ document.addEventListener("show.bs.tab", resizeCharts); function createChart(div_id, options) { const chartElement = document.getElementById(div_id); - const chart = echarts.init(chartElement, null, {renderer: 'svg'}); + let chart; + if (echarts.getInstanceByDom(chartElement)) { + chart = echarts.getInstanceByDom(chartElement); + chart.clear(); + } else { + chart = echarts.init(chartElement, null, {renderer: 'svg'}); + } chart.setOption(options); + chart.resize(); } diff --git a/digiplan/static/js/elements.js b/digiplan/static/js/elements.js index da6482aa..e68f681b 100644 --- a/digiplan/static/js/elements.js +++ b/digiplan/static/js/elements.js @@ -1,2 +1,46 @@ -export const resultsDropdown = document.getElementById("result_views"); +export const statusquoDropdown = document.getElementById("situation_today"); +export const futureDropdown = document.getElementById("result_views"); export const resultsTabs = document.getElementById("results-tabs"); + +// Show onboarding modal on start +document.addEventListener('DOMContentLoaded', (event) => { + var myModal = new bootstrap.Modal(document.getElementById('onboardingModal'), {}); + myModal.show(); +}); + +// Prevent continuous cycle of modal carousel +document.addEventListener("DOMContentLoaded", function() { + var carouselEl = document.querySelector('#carouselExampleIndicators'); + var carousel = new bootstrap.Carousel(carouselEl, { + wrap: false + }); + + var prevButton = document.querySelector('.carousel-control-prev'); + var nextButton = document.querySelector('.carousel-control-next'); + + prevButton.addEventListener('click', function (event) { + event.preventDefault(); + carousel.prev(); + }); + + nextButton.addEventListener('click', function (event) { + event.preventDefault(); + carousel.next(); + }); + + carouselEl.addEventListener('slid.bs.carousel', function () { + const carouselItems = carouselEl.querySelectorAll('.carousel-item'); + const currentIndex = Array.prototype.indexOf.call(carouselItems, carouselEl.querySelector('.carousel-item.active')); + if (currentIndex === 0) { + prevButton.classList.add('transparent'); + } else { + prevButton.classList.remove('transparent'); + } + + if (currentIndex === carouselItems.length - 1) { + nextButton.classList.add('transparent'); + } else { + nextButton.classList.remove('transparent'); + } + }); + }); diff --git a/digiplan/static/js/event-topics.js b/digiplan/static/js/event-topics.js index 1ac3d6bd..db3806f1 100644 --- a/digiplan/static/js/event-topics.js +++ b/digiplan/static/js/event-topics.js @@ -18,6 +18,10 @@ const eventTopics = { POWER_PANEL_SLIDER_CHANGE: "POWER_PANEL_SLIDER_CHANGE", PANEL_SLIDER_CHANGE: "PANEL_SLIDER_CHANGE", MORE_LABEL_CLICK: "MORE_LABEL_CLICK", + PV_CONTROL_ACTIVATED: "PV_CONTROL_ACTIVATED", + PV_CONTROL_DEACTIVATED: "PV_CONTROL_DEACTIVATED", + WIND_CONTROL_ACTIVATED: "WIND_CONTROL_ACTIVATED", + WIND_CONTROL_DEACTIVATED: "WIND_CONTROL_DEACTIVATED", MENU_CHANGED: "MENU_CHANGED", MENU_STATUS_QUO_SELECTED: "MENU_STATUS_QUO_CLICKED", diff --git a/digiplan/static/js/intro_tour.js b/digiplan/static/js/intro_tour.js index d146909b..89655a80 100644 --- a/digiplan/static/js/intro_tour.js +++ b/digiplan/static/js/intro_tour.js @@ -1,3 +1,5 @@ +const onbaordingCloseBtn = document.getElementById("close-onboarding"); + const tour = new Shepherd.Tour({ // jshint ignore:line useModalOverlay: true, defaultStepOptions: { @@ -88,4 +90,6 @@ tour.addStep({ id: 'creating' }); -tour.start(); +onbaordingCloseBtn.addEventListener("click", function() { + tour.start(); +}); diff --git a/digiplan/static/js/menu.js b/digiplan/static/js/menu.js index 60ebb45f..96846909 100644 --- a/digiplan/static/js/menu.js +++ b/digiplan/static/js/menu.js @@ -1,4 +1,4 @@ -import {resultsDropdown, resultsTabs} from "./elements.js"; +import {statusquoDropdown, resultsTabs} from "./elements.js"; const menuNextBtn = document.getElementById("menu_next_btn"); const menuPreviousBtn = document.getElementById("menu_previous_btn"); @@ -24,10 +24,12 @@ chartTab.addEventListener("click", function () { PubSub.subscribe(eventTopics.MENU_STATUS_QUO_SELECTED, setMapChartViewVisibility); PubSub.subscribe(eventTopics.MENU_STATUS_QUO_SELECTED, showMapView); +PubSub.subscribe(eventTopics.MENU_STATUS_QUO_SELECTED, hidePotentialLayers); PubSub.subscribe(eventTopics.MENU_SETTINGS_SELECTED, setMapChartViewVisibility); PubSub.subscribe(eventTopics.MENU_SETTINGS_SELECTED, showMapView); PubSub.subscribe(eventTopics.MENU_SETTINGS_SELECTED, deactivateChoropleth); PubSub.subscribe(eventTopics.MENU_RESULTS_SELECTED, setMapChartViewVisibility); +PubSub.subscribe(eventTopics.MENU_RESULTS_SELECTED, hidePotentialLayers); PubSub.subscribe(eventTopics.MAP_VIEW_SELECTED, setResultsView); PubSub.subscribe(eventTopics.CHART_VIEW_SELECTED, setResultsView); @@ -90,10 +92,10 @@ function setMapChartViewVisibility(msg) { function setResultsView(msg) { if (msg === eventTopics.CHART_VIEW_SELECTED) { - resultsDropdown.parentElement.setAttribute("style", "display: none !important"); + statusquoDropdown.parentElement.setAttribute("style", "display: none !important"); resultsTabs.parentElement.setAttribute("style", ""); } else { - resultsDropdown.parentElement.setAttribute("style", ""); + statusquoDropdown.parentElement.setAttribute("style", ""); resultsTabs.parentElement.setAttribute("style", "display: none !important"); } return logMessage(msg); diff --git a/digiplan/static/js/results.js b/digiplan/static/js/results.js index 5f5b8aab..01368948 100644 --- a/digiplan/static/js/results.js +++ b/digiplan/static/js/results.js @@ -1,19 +1,28 @@ -import {resultsDropdown} from "./elements.js"; +import {statusquoDropdown, futureDropdown} from "./elements.js"; const imageResults = document.getElementById("info_tooltip_results"); const simulation_spinner = document.getElementById("simulation_spinner"); const SIMULATION_CHECK_TIME = 5000; +const resultCharts = { + "detailed_overview": "detailed_overview_chart", + "electricity_overview": "electricity_overview_chart" +}; + // Setup // Disable settings form submit $('#settings').submit(false); -resultsDropdown.addEventListener("change", function() { - PubSub.publish(mapEvent.CHOROPLETH_SELECTED, resultsDropdown.value); - imageResults.title = resultsDropdown.options[resultsDropdown.selectedIndex].title; +statusquoDropdown.addEventListener("change", function() { + PubSub.publish(mapEvent.CHOROPLETH_SELECTED, statusquoDropdown.value); + imageResults.title = statusquoDropdown.options[statusquoDropdown.selectedIndex].title; +}); +futureDropdown.addEventListener("change", function() { + PubSub.publish(mapEvent.CHOROPLETH_SELECTED, futureDropdown.value); + imageResults.title = futureDropdown.options[futureDropdown.selectedIndex].title; }); @@ -23,6 +32,10 @@ PubSub.subscribe(eventTopics.MENU_RESULTS_SELECTED, showSimulationSpinner); PubSub.subscribe(eventTopics.SIMULATION_STARTED, checkResultsPeriodically); PubSub.subscribe(eventTopics.SIMULATION_FINISHED, showResults); PubSub.subscribe(eventTopics.SIMULATION_FINISHED, hideSimulationSpinner); +PubSub.subscribe(eventTopics.SIMULATION_FINISHED, showResultCharts); +PubSub.subscribe(mapEvent.CHOROPLETH_SELECTED, showRegionChart); +// for testing: +PubSub.subscribe(eventTopics.CHART_VIEW_SELECTED, showResultCharts); // Subscriber Functions @@ -97,3 +110,36 @@ function hideSimulationSpinner(msg) { simulation_spinner.hidden = true; return logMessage(msg); } + +function showRegionChart(msg, lookup) { + const region_lookup = `${lookup}_region`; + let charts = {}; + if (region_lookup.includes("2045")) { + charts[region_lookup] = "region_chart_2045"; + } else { + charts[region_lookup] = "region_chart_statusquo"; + } + showCharts(charts); + return logMessage(msg); +} + +function showResultCharts(msg) { + showCharts(resultCharts); + return logMessage(msg); +} + +function showCharts(charts={}) { + $.ajax({ + url : "/charts", + type : "GET", + data : { + "charts": Object.keys(charts), + "map_state": map_store.cold.state + }, + success : function(chart_options) { + for (const chart in charts) { + createChart(charts[chart], chart_options[chart]); + } + }, + }); +} diff --git a/digiplan/static/js/sliders.js b/digiplan/static/js/sliders.js index f9b4bf59..49e36fbc 100644 --- a/digiplan/static/js/sliders.js +++ b/digiplan/static/js/sliders.js @@ -9,6 +9,26 @@ const sliderMoreLabels = document.querySelectorAll(".c-slider__label--more > .bu const powerMixInfoBanner = document.getElementById("js-power-mix"); +const potentialPVLayers = ["potentialarea_pv_agriculture_lfa-off_region", "potentialarea_pv_road_railway_region"]; +const potentialWindLayers = [ + "potentialarea_wind_stp_2018_vreg", + "potentialarea_wind_stp_2027_repowering", + "potentialarea_wind_stp_2027_search_area_forest_area", + "potentialarea_wind_stp_2027_search_area_open_area", + "potentialarea_wind_stp_2027_vr" +]; +const potentialWindSwitches = document.querySelectorAll("#id_s_w_3, #id_s_w_4, #id_s_w_4_1, #id_s_w_4_2, #id_s_w_5, #id_s_w_5_1, #id_s_w_5_2"); + +const sectorSlider = document.querySelectorAll("#id_s_v_3, #id_s_v_4, #id_s_v_5, #id_w_d_wp_3, #id_w_d_wp_4, #id_w_d_wp_5, #id_w_v_3, #id_w_v_4, #id_w_v_5"); + +const sliderDependencies = { + "id_s_s_g_1": "id_s_s_g_3", + "id_w_z_wp_1": "id_w_z_wp_3", + "id_w_d_s_1": "id_w_d_s_3", + "id_w_z_s_1": "id_w_z_s_3", + "id_v_iv_1": "id_v_iv_3" +}; + // Setup // Order matters. Start with the most specific, and end with most general sliders. @@ -30,18 +50,99 @@ Array.from(Object.keys(SETTINGS_DEPENDENCY_MAP)).forEach(dependent_name => { }); $(".js-slider.js-slider-panel.js-power-mix").ionRangeSlider({ onChange: function (data) { - const msg = eventTopics.POWER_PANEL_SLIDER_CHANGE; - PubSub.publish(msg, data); + PubSub.publish(eventTopics.POWER_PANEL_SLIDER_CHANGE, data); + } + } +); +$(potentialWindSwitches).on("change", function () { + PubSub.publish(eventTopics.WIND_CONTROL_ACTIVATED); +}); +$(".js-slider.js-slider-panel").ionRangeSlider({ + onChange: function (data) { + PubSub.publish(eventTopics.PANEL_SLIDER_CHANGE, data); + } + } +); +$(sectorSlider).ionRangeSlider({ + onChange: function (data) { + calculate_slider_value(data); } } ); + $(".js-slider.js-slider-panel").ionRangeSlider({ onChange: function (data) { - const msg = eventTopics.PANEL_SLIDER_CHANGE; - PubSub.publish(msg, data); + PubSub.publish(eventTopics.PANEL_SLIDER_CHANGE, data); + } + } +); +$(".form-check-input").on( + 'click', function (data) { + toggleFormFields(data.target.id); + } +); +$("#id_s_w_5_1").ionRangeSlider({ + onChange: function (data) { + calculate_max_wind(); + } + } +); +$("#id_s_w_5_2").ionRangeSlider({ + onChange: function (data) { + calculate_max_wind(); + } + } +); +$("#id_s_pv_ff_3").ionRangeSlider({ + onChange: function (data) { + calculate_max_pv_ff(); + } + } +); +$("#id_s_pv_ff_4").ionRangeSlider({ + onChange: function (data) { + calculate_max_pv_ff(); } } ); +$("#id_s_pv_d_3").ionRangeSlider({ + onChange: function (data) { + let new_max = Math.round(Math.round(store.cold.slider_max.s_pv_d_3) * (data.from/100)); + $(`#id_s_pv_d_1`).data("ionRangeSlider").update({max:new_max}); + } + } +); +$("#id_w_z_wp_3").ionRangeSlider({ + onChange: function (data) { + $(`#id_w_z_wp_1`).data("ionRangeSlider").update({from:data.from}); + } + } +); +$("#id_w_d_s_3").ionRangeSlider({ + onChange: function (data) { + $(`#id_w_d_s_1`).data("ionRangeSlider").update({from:data.from}); + } + } +); +$("#id_w_z_s_3").ionRangeSlider({ + onChange: function (data) { + $(`#id_w_z_s_1`).data("ionRangeSlider").update({from:data.from}); + } + } +); +$("#id_v_iv_3").ionRangeSlider({ + onChange: function (data) { + $(`#id_v_iv_1`).data("ionRangeSlider").update({from:data.from}); + } + } +); +$("#id_s_s_g_3").ionRangeSlider({ + onChange: function (data) { + $(`#id_s_s_g_1`).data("ionRangeSlider").update({from:data.from}); + } + } +); + $(".js-slider").ionRangeSlider(); Array.from(sliderMoreLabels).forEach(moreLabel => { @@ -66,17 +167,66 @@ subscribeToEvents( [eventTopics.POWER_PANEL_SLIDER_CHANGE, eventTopics.PANEL_SLIDER_CHANGE], showActivePanelSliderOnPanelSliderChange ); +subscribeToEvents( + [eventTopics.POWER_PANEL_SLIDER_CHANGE, eventTopics.PANEL_SLIDER_CHANGE], + hidePotentialLayers +); +subscribeToEvents( + [eventTopics.POWER_PANEL_SLIDER_CHANGE, eventTopics.PANEL_SLIDER_CHANGE], + checkMainPanelSlider +); PubSub.subscribe(eventTopics.MORE_LABEL_CLICK, showOrHideSidepanelsOnMoreLabelClick); +PubSub.subscribe(eventTopics.MORE_LABEL_CLICK, showOrHidePotentialLayersOnMoreLabelClick); PubSub.subscribe(eventTopics.DEPENDENCY_PANEL_SLIDER_CHANGE, (msg, payload) => { const {dependent, dependency, data} = payload; const value = DEPENDENCY_PARAMETERS[dependency][dependent][data.from]; const dependentDataElement = $("#id_" + dependent).data("ionRangeSlider"); dependentDataElement.update({max: value}); }); +PubSub.subscribe(eventTopics.PV_CONTROL_ACTIVATED, showPVLayers); +PubSub.subscribe(eventTopics.WIND_CONTROL_ACTIVATED, showWindLayers); // Subscriber Functions +function checkMainPanelSlider(msg, data) { + if (sliderDependencies.hasOwnProperty(data.input[0].id)) { + let target = sliderDependencies[data.input[0].id]; + $('#' + target).data("ionRangeSlider").update({from:data.from}); + } + if (data.input[0].id === "id_s_v_1") { + $(`#id_s_v_3`).data("ionRangeSlider").update({from:data.from}); + $(`#id_s_v_4`).data("ionRangeSlider").update({from:data.from}); + $(`#id_s_v_5`).data("ionRangeSlider").update({from:data.from}); + } + if (data.input[0].id === "id_w_d_wp_1") { + $(`#id_w_d_wp_3`).data("ionRangeSlider").update({from:data.from}); + $(`#id_w_d_wp_4`).data("ionRangeSlider").update({from:data.from}); + $(`#id_w_d_wp_5`).data("ionRangeSlider").update({from:data.from}); + } + if (data.input[0].id === "id_w_v_1") { + $(`#id_w_v_3`).data("ionRangeSlider").update({from:data.from}); + $(`#id_w_v_4`).data("ionRangeSlider").update({from:data.from}); + $(`#id_w_v_5`).data("ionRangeSlider").update({from:data.from}); + } +} + +function showOrHidePotentialLayersOnMoreLabelClick(msg, moreLabel) { + const classes = ["active", "active-sidepanel"]; + const show = moreLabel.classList.contains(classes[0]); + hidePotentialLayers(); + if (show) { + const sliderLabel = moreLabel.getElementsByTagName("input")[0]; + if (sliderLabel.id === "id_s_pv_ff_1") { + PubSub.publish(eventTopics.PV_CONTROL_ACTIVATED); + } + if (sliderLabel.id === "id_s_w_1") { + PubSub.publish(eventTopics.WIND_CONTROL_ACTIVATED); + } + } + return logMessage(msg); +} + function showOrHideSidepanelsOnMoreLabelClick(msg, moreLabel) { const classes = ["active", "active-sidepanel"]; const hide = moreLabel.classList.contains(classes[0]) && moreLabel.classList.contains(classes[1]); @@ -124,6 +274,165 @@ function updateSliderMarks(msg) { return logMessage(msg); } +function showPVLayers(msg) { + hidePotentialLayers(); + for (const layer of potentialPVLayers) { + map.setLayoutProperty(layer, "visibility", "visible"); + } + return logMessage(msg); +} + +function calculate_slider_value(data) { + if (data.input[0].id === "id_s_v_3" || data.input[0].id === "id_s_v_4" || data.input[0].id === "id_s_v_5") { + let factor_hh = $("#id_s_v_3").data("ionRangeSlider").result.from; + let factor_ind = $("#id_s_v_5").data("ionRangeSlider").result.from; + let factor_cts = $("#id_s_v_4").data("ionRangeSlider").result.from; + let demand_hh = store.cold.slider_per_sector.s_v_1.hh; + let demand_ind = store.cold.slider_per_sector.s_v_1.ind; + let demand_cts = store.cold.slider_per_sector.s_v_1.cts; + let new_val = (factor_hh * demand_hh + factor_ind * demand_ind + factor_cts * demand_cts) / (demand_hh + demand_ind + demand_cts); + $(`#id_s_v_1`).data("ionRangeSlider").update({from:new_val}); + } + if (data.input[0].id === "id_w_d_wp_3" || data.input[0].id === "id_w_d_wp_4" || data.input[0].id === "id_w_d_wp_5") { + let factor_hh = $("#id_w_d_wp_3").data("ionRangeSlider").result.from; + let factor_ind = $("#id_w_d_wp_5").data("ionRangeSlider").result.from; + let factor_cts = $("#id_w_d_wp_4").data("ionRangeSlider").result.from; + let demand_hh = store.cold.slider_per_sector.w_d_wp_1.hh; + let demand_ind = store.cold.slider_per_sector.w_d_wp_1.ind; + let demand_cts = store.cold.slider_per_sector.w_d_wp_1.cts; + let new_val = (factor_hh * demand_hh + factor_ind * demand_ind + factor_cts * demand_cts) / (demand_hh + demand_ind + demand_cts); + $(`#id_w_d_wp_1`).data("ionRangeSlider").update({from:new_val}); + } + if (data.input[0].id === "id_w_v_3" || data.input[0].id === "id_w_v_4" || data.input[0].id === "id_w_v_5") { + let factor_hh = $("#id_w_v_3").data("ionRangeSlider").result.from; + let factor_ind = $("#id_w_v_5").data("ionRangeSlider").result.from; + let factor_cts = $("#id_w_v_4").data("ionRangeSlider").result.from; + let demand_hh = store.cold.slider_per_sector.w_d_wp_1.hh; + let demand_ind = store.cold.slider_per_sector.w_d_wp_1.ind; + let demand_cts = store.cold.slider_per_sector.w_d_wp_1.cts; + let new_val = (factor_hh * demand_hh + factor_ind * demand_ind + factor_cts * demand_cts) / (demand_hh + demand_ind + demand_cts); + $(`#id_w_v_1`).data("ionRangeSlider").update({from:new_val}); + } +} + +function calculate_max_wind() { + let slider_one = $("#id_s_w_5_1").data("ionRangeSlider").result.from / 100; + let slider_two = $("#id_s_w_5_2").data("ionRangeSlider").result.from / 100; + let new_max = slider_one * Math.round(store.cold.slider_max.s_w_5_1) + slider_two * Math.round(store.cold.slider_max.s_w_5_2); + $(`#id_s_w_1`).data("ionRangeSlider").update({max:Math.round(new_max)}); +} + +function calculate_max_pv_ff() { + let slider_one = $("#id_s_pv_ff_3").data("ionRangeSlider").result.from / 100; + let slider_two = $("#id_s_pv_ff_4").data("ionRangeSlider").result.from / 100; + let new_max = slider_one * Math.round(store.cold.slider_max.s_pv_ff_3) + slider_two * Math.round(store.cold.slider_max.s_pv_ff_4); + $(`#id_s_pv_ff_1`).data("ionRangeSlider").update({max:Math.round(new_max)}); +} + +function toggleFormFields(formfield_id) { + if (formfield_id === "id_s_w_3") { + if (document.getElementById("id_s_w_4").checked === false && document.getElementById("id_s_w_5").checked === false) { + document.getElementById("id_s_w_3").checked = true; + } + else { + document.getElementById("id_s_w_4").checked = false; + document.getElementById("id_s_w_4_1").disabled = true; + document.getElementById("id_s_w_4_2").disabled = true; + document.getElementById("id_s_w_5").checked = false; + $(`#id_s_w_5_1`).data("ionRangeSlider").update({block:true}); + $(`#id_s_w_5_2`).data("ionRangeSlider").update({block:true}); + $(`#id_s_w_1`).data("ionRangeSlider").update({max:Math.round(store.cold.slider_max.s_w_3)}); + } + } + if (formfield_id === "id_s_w_4") { + if (document.getElementById("id_s_w_3").checked === false && document.getElementById("id_s_w_5").checked === false) { + document.getElementById("id_s_w_4").checked = true; + } + else { + if (document.getElementById("id_s_w_4_1").checked === true && document.getElementById("id_s_w_4_2").checked === true) { + $(`#id_s_w_1`).data("ionRangeSlider").update({max:Math.round(store.cold.slider_max.s_w_4_1) + Math.round(store.cold.slider_max.s_w_4_2)}); + } + if (document.getElementById("id_s_w_4_1").checked === false && document.getElementById("id_s_w_4_2").checked === true) { + $(`#id_s_w_1`).data("ionRangeSlider").update({max:Math.round(store.cold.slider_max.s_w_4_2)}); + } + if (document.getElementById("id_s_w_4_1").checked === true && document.getElementById("id_s_w_4_2").checked === false) { + $(`#id_s_w_1`).data("ionRangeSlider").update({max:Math.round(store.cold.slider_max.s_w_4_1)}); + } + document.getElementById("id_s_w_3").checked = false; + document.getElementById("id_s_w_4_1").disabled = false; + document.getElementById("id_s_w_4_2").disabled = false; + document.getElementById("id_s_w_5").checked = false; + $(`#id_s_w_5_1`).data("ionRangeSlider").update({block: true}); + $(`#id_s_w_5_2`).data("ionRangeSlider").update({block: true}); + } + } + if (formfield_id === "id_s_w_4_1") { + if (document.getElementById("id_s_w_4_2").checked === false) { + document.getElementById("id_s_w_4_1").checked = true; + $(`#id_s_w_1`).data("ionRangeSlider").update({max:Math.round(store.cold.slider_max.s_w_4_1)}); + } + if (document.getElementById("id_s_w_4_1").checked === true && document.getElementById("id_s_w_4_2").checked === true) { + $(`#id_s_w_1`).data("ionRangeSlider").update({max:Math.round(store.cold.slider_max.s_w_4_1) + Math.round(store.cold.slider_max.s_w_4_2)}); + } + if (document.getElementById("id_s_w_4_1").checked === false && document.getElementById("id_s_w_4_2").checked === true) { + $(`#id_s_w_1`).data("ionRangeSlider").update({max:Math.round(store.cold.slider_max.s_w_4_2)}); + } + } + if (formfield_id === "id_s_w_4_2") { + if (document.getElementById("id_s_w_4_1").checked === false) { + document.getElementById("id_s_w_4_2").checked = true; + $(`#id_s_w_1`).data("ionRangeSlider").update({max:Math.round(store.cold.slider_max.s_w_4_2)}); + } + if (document.getElementById("id_s_w_4_1").checked === true && document.getElementById("id_s_w_4_2").checked === true) { + $(`#id_s_w_1`).data("ionRangeSlider").update({max:Math.round(store.cold.slider_max.s_w_4_1) + Math.round(store.cold.slider_max.s_w_4_2)}); + } + if (document.getElementById("id_s_w_4_1").checked === true && document.getElementById("id_s_w_4_2").checked === false) { + $(`#id_s_w_1`).data("ionRangeSlider").update({max:Math.round(store.cold.slider_max.s_w_4_1)}); + } + } + if (formfield_id === "id_s_w_5") { + if (document.getElementById("id_s_w_3").checked === false && document.getElementById("id_s_w_4").checked === false) { + document.getElementById("id_s_w_5").checked = true; + } + else { + document.getElementById("id_s_w_3").checked = false; + document.getElementById("id_s_w_4").checked = false; + document.getElementById("id_s_w_4_1").disabled = true; + document.getElementById("id_s_w_4_2").disabled = true; + $(`#id_s_w_5_1`).data("ionRangeSlider").update({block:false}); + $(`#id_s_w_5_2`).data("ionRangeSlider").update({block:false}); + calculate_max_wind(); + } + } +} + +function showWindLayers(msg) { + hidePotentialLayers(); + if (document.getElementById("id_s_w_3").checked) { + map.setLayoutProperty("potentialarea_wind_stp_2018_vreg", "visibility", "visible"); + } + if (document.getElementById("id_s_w_4").checked) { + if (document.getElementById("id_s_w_4_1").checked) { + map.setLayoutProperty("potentialarea_wind_stp_2027_vr", "visibility", "visible"); + } + if (document.getElementById("id_s_w_4_2").checked) { + map.setLayoutProperty("potentialarea_wind_stp_2027_repowering", "visibility", "visible"); + } + } + if (document.getElementById("id_s_w_5").checked) { + map.setLayoutProperty("potentialarea_wind_stp_2027_search_area_open_area", "visibility", "visible"); + map.setLayoutProperty("potentialarea_wind_stp_2027_search_area_forest_area", "visibility", "visible"); + } + return logMessage(msg); +} + +function hidePotentialLayers(msg) { + for (const layer of potentialPVLayers.concat(potentialWindLayers)) { + map.setLayoutProperty(layer, "visibility", "none"); + } + return logMessage(msg); +} + // Helper Functions @@ -183,3 +492,17 @@ function addMarks(data, marks) { data.slider.append(html); } + + +$(document).ready(function () { + document.getElementById("id_s_w_4_1").checked = true; + document.getElementById("id_s_w_4_1").disabled = true; + document.getElementById("id_s_w_4_2").disabled = true; + document.getElementById("id_s_w_3").checked = true; + $(`#id_s_w_5_1`).data("ionRangeSlider").update({from:13, block:true}); + $(`#id_s_w_5_2`).data("ionRangeSlider").update({from:13, block:true}); + document.getElementById("id_s_w_5_1").disabled = true; + document.getElementById("id_s_w_5_2").disabled = true; + $(`#id_s_h_1`).data("ionRangeSlider").update({block:true}); + calculate_max_pv_ff(); +}); diff --git a/digiplan/static/scss/base/_variables.scss b/digiplan/static/scss/base/_variables.scss index f0465110..5012ba11 100644 --- a/digiplan/static/scss/base/_variables.scss +++ b/digiplan/static/scss/base/_variables.scss @@ -16,6 +16,11 @@ $c-color-conventional: #A6BDDB; $c-color-pvground: #FA9FB5; $c-color-pvroof: #FEC44F; +$windlight: #6A89CC; +$winddark: #273f73; +$pvlight: #ffd744; +$pvdark: #c19800; + // TYPOGRAPHY $c-letter-spacing: 0.03rem; $font-size-xlarge: 1.953rem; // 31.25px @@ -55,9 +60,10 @@ $map-padding-x-small: 2rem; $map-layers-btn-size: 3rem; $map-items-padding: 1rem; $map-layers-box-legend-color-size: 0.875rem; -$map-layers-box-height: 65vh; +$map-layers-box-height: 62vh; $map-layers-box-width: 18rem; $map-layers-box-z-index: 200; +$map-legend-box-height: 8.5rem; $map-legend-box-padding-bottom: 2rem; // Map controls diff --git a/digiplan/static/scss/components/_charts.scss b/digiplan/static/scss/components/_charts.scss index f9c1baad..84ce074c 100644 --- a/digiplan/static/scss/components/_charts.scss +++ b/digiplan/static/scss/components/_charts.scss @@ -1,17 +1,9 @@ -#chart1, -#chart2 { - width: 40%; - height: 260px; -} - -#chart3, -#chart4 { +#region_chart_statusquo, +#region_chart_future { width: 100%; height: 300px; } - - .power-mix { @extend .position-relative; @extend .d-flex; diff --git a/digiplan/static/scss/components/_map.scss b/digiplan/static/scss/components/_map.scss index d691e46e..851ef8aa 100644 --- a/digiplan/static/scss/components/_map.scss +++ b/digiplan/static/scss/components/_map.scss @@ -62,8 +62,9 @@ @extend .bg-white; @extend .border; @extend .p-2; + @extend .overflow-auto; width: $map-layers-box-width; - height: $map-layers-box-height; + height: calc(100vh - #{$top-nav-height} - #{$steps-height} - #{$map-legend-box-height} - #{$map-legend-box-padding-bottom} - (2 * #{$map-items-padding})); top: calc(#{$steps-height} + #{$map-items-padding}); right: $map-items-padding; z-index: $map-layers-box-z-index; @@ -80,6 +81,10 @@ @extend .text-uppercase; @extend .fw-bold; @extend .mb-1; + + &:not(:first-of-type) { + @extend .pt-2; + } } } @@ -89,17 +94,27 @@ @extend .justify-content-between; &__legend { + @extend .d-flex; + @extend .flex-row; + @extend .flex-nowrap; + &-color { @extend .d-inline-block; @include translateY(2px); + flex: 0 0 1rem; width: 1rem; height: 1rem; - background-color: blue; + + &--rounded { + @extend .rounded-circle; + } } &-text { @extend .d-inline-block; @extend .fs-7; + @extend .fw-light; + @extend .ps-1; } } &__control { @@ -123,7 +138,6 @@ @extend .fs-8; background-color: rgba(255, 255, 255, 0.8); width: calc(100% - 7rem); - height: 10rem; right: $map-padding-x-small; bottom: 5rem; z-index: $map-layers-box-z-index; @@ -131,7 +145,6 @@ @include media-breakpoint-up(sm) { font-size: $font-size-small !important; width: $map-layers-box-width; - height: calc(100vh - #{$top-nav-height} - #{$steps-height} - #{$map-layers-box-height} - (2 * #{#{$map-items-padding}}) - #{$map-legend-box-padding-bottom}); right: $map-items-padding; bottom: 2rem; } @@ -177,13 +190,17 @@ } } -@media only screen and (max-height: 700px) { - .map__layers-box { - height: 55vh; - } +#legend.legend { + height: $map-legend-box-height; .legend { - height: calc(100vh - #{$top-nav-height} - #{$steps-height} - 55vh - (2 * #{#{$map-items-padding}}) - #{$map-legend-box-padding-bottom}); + &__title { + @extend .d-none; + } + + &__detail { + @extend .pb-1; + } } } diff --git a/digiplan/static/scss/components/_modals.scss b/digiplan/static/scss/components/_modals.scss index e6db2545..8c0b2d9f 100644 --- a/digiplan/static/scss/components/_modals.scss +++ b/digiplan/static/scss/components/_modals.scss @@ -25,3 +25,46 @@ @extend .py-4; } } + +.onboarding-modal { + .carousel-item { + &__content { + @extend .col-8; + @extend .bg-white; + @extend .ps-5; + @extend .pe-4; + } + } + + img { + height: 100%; + object-fit: cover; + } + + .carousel-control-next, + .carousel-control-prev { + @extend .position-relative; + opacity: 1 !important; + background-color: $gray-700 !important; + + &.transparent { + @extend .bg-white; + @extend .text-white; + pointer-events: none; + } + } + + .carousel-control-prev { + background-color: $gray-200 !important; + color: $gray-800 !important; + } + + .btn, .modal-footer button { + opacity: 1 !important; + } + + .modal-body { + height: 40rem; + overflow: hidden; + } +} diff --git a/digiplan/static/scss/components/_popup.scss b/digiplan/static/scss/components/_popup.scss index 0e80a235..b60a4813 100644 --- a/digiplan/static/scss/components/_popup.scss +++ b/digiplan/static/scss/components/_popup.scss @@ -84,6 +84,26 @@ } } + .popup--cluster { + table { + @extend .table; + @extend .table-sm; + @extend .mb-0; + + thead th { + @extend .border-bottom; + @extend .border-primary; + @extend .fs-7; + @extend .p-1; + } + + tr th, + tr td { + @extend .ps-2; + } + } + } + .maplibregl-popup-close-button, .mapboxgl-popup-close-button { @extend .fs-3; diff --git a/digiplan/static/scss/layouts/_panel.scss b/digiplan/static/scss/layouts/_panel.scss index 07446459..a551c62f 100644 --- a/digiplan/static/scss/layouts/_panel.scss +++ b/digiplan/static/scss/layouts/_panel.scss @@ -151,7 +151,8 @@ } .c-slider.active { - @extend .px-3; + @extend .ps-2; + @extend .pe-3; @extend .bg-light; } @@ -273,7 +274,7 @@ @extend .bg-light; @extend .p-3; @extend .overflow-auto; - width: 18rem; + width: 20rem; left: $panel-width-sm; padding-top: $padding-large !important; @@ -291,8 +292,100 @@ @extend .d-flex; @extend .flex-row; @extend .justify-content-between; - @extend .fs-7; + @extend .fs-6; @extend .fw-bold; + @extend .mb-1; + } + + &__indication { + @extend .text-secondary; + @extend .fs-7; + } + + .sidepanel__block { + @extend .border-bottom; + @extend .pb-2; + @extend .pt-2; + + .c-slider { + @extend .d-flex; + @extend .flex-row; + @extend .justify-content-between; + @extend .pb-0; + + &:first-of-type .form-switch .form-check-input { + width: 2.25rem; + height: 1.25rem; + } + + &:not(:first-of-type) { + @extend .fw-light; + @extend .ps-2; + } + + &.s_w_5_1, + &.s_w_5_2 { + @extend .d-block; + } + } + + &--wind-light { + .form-check.form-switch .form-check-input:checked, + .irs.irs--flat .irs-bar, .irs.irs--flat .irs-handle > i:first-child, .irs.irs--flat .irs-single { + background-color: $windlight; + border-color: $windlight; + } + + .irs.irs--flat .irs-single:before { + border-top-color: $windlight; + } + } + + &--wind-dark { + .form-check.form-switch .form-check-input:checked, + .irs.irs--flat .irs-bar, .irs.irs--flat .irs-handle > i:first-child, .irs.irs--flat .irs-single { + background-color: $winddark; + border-color: $winddark; + } + + .irs.irs--flat .irs-single:before { + border-top-color: $winddark; + } + } + + &--pv-light { + .irs.irs--flat .irs-bar, .irs.irs--flat .irs-handle > i:first-child, .irs.irs--flat .irs-single { + background-color: $pvlight; + border-color: $pvlight; + } + + .irs.irs--flat .irs-single:before { + border-top-color: $pvlight; + } + } + + &--pv-dark { + .irs.irs--flat .irs-bar, .irs.irs--flat .irs-handle > i:first-child, .irs.irs--flat .irs-single { + background-color: $pvdark; + border-color: $pvdark; + } + + .irs.irs--flat .irs-single:before { + border-top-color: $pvdark; + } + } + } + + .sidepanel__block.sidepanel__block--slider { + .c-slider { + @extend .d-block; + } + } + + &__results { + @extend .pb-1; + @extend .pt-3; + @extend .fs-7; } &__close { diff --git a/digiplan/templates/components/map.html b/digiplan/templates/components/map.html index 230ab600..51590d31 100644 --- a/digiplan/templates/components/map.html +++ b/digiplan/templates/components/map.html @@ -1,5 +1,7 @@ {% load static i18n %} +{% include "components/onboarding.html" %} +
+
+
+ + + +
+
+ + +
+
+ + diff --git a/digiplan/templates/components/panel_1_today.html b/digiplan/templates/components/panel_1_today.html index 3428d23c..5203d216 100644 --- a/digiplan/templates/components/panel_1_today.html +++ b/digiplan/templates/components/panel_1_today.html @@ -1,9 +1,9 @@ {% load static i18n %}
-
- {% translate "Goals 2045" %} -
+ + +
@@ -15,7 +15,7 @@
- {% translate "CO2-Emissions (Mt)" %} + {% translate "CO2-Reduktion ggü. 2019 (%)" %}
@@ -36,62 +36,66 @@

Info Icon @@ -99,8 +103,7 @@

-
-
+

diff --git a/digiplan/templates/components/panel_3_results.html b/digiplan/templates/components/panel_3_results.html index dae926bd..ef52abca 100644 --- a/digiplan/templates/components/panel_3_results.html +++ b/digiplan/templates/components/panel_3_results.html @@ -12,7 +12,7 @@
- {% translate "CO2-Emissions (Mt)" %} + {% translate "CO2-Reduktion ggü. 2019 (%)" %}
@@ -42,14 +42,14 @@

title="{% translate "Annual balance sheet share of renewable energy (wind energy, photovoltaic, hydroelectric power) in the electricity demand of the sectors agriculture, GHG (trade, commerce, services), households and industry in percent. The demand is the net electricity consumption, i.e. transmission losses and power plant consumption are not taken into account. 49.7% of the electricity demand in Germany was covered by renewable energies in 2022." %}"> {% translate "Renewable Energy Share of Demand" %} (%) - - - @@ -91,6 +91,11 @@

Info Icon

+
+
+
+
+

{% translate "View" %}

@@ -100,7 +105,7 @@

- {% translate "General" %} + {% translate "Overview" %} +

diff --git a/digiplan/templates/components/results_view.html b/digiplan/templates/components/results_view.html index b617a725..ddb6611e 100644 --- a/digiplan/templates/components/results_view.html +++ b/digiplan/templates/components/results_view.html @@ -32,19 +32,21 @@

{% translate "General" %}

-

{% translate "General" %}

+

{% translate "Electricity" %}

{% translate "Overview" %}
-
+
+ {% translate "Hier folgt ein Beschreibungstext..." noop %} +
{% translate "CO2 Emissions" %}
-
+ {% translate "Hier folgt ein Beschreibungstext..." noop %}
@@ -55,34 +57,68 @@

{% translate "Heat" %}

-
{% translate "Overview" %}
+
{% translate "Endenergiebedarf" %}
-
+
+ {% translate "Hier folgt ein Beschreibungstext..." noop %} +
-
{% translate "CO2 Emissions" %}
+
{% translate "Beheizungsstruktur" %}
-
+ {% translate "Hier folgt ein Beschreibungstext..." noop %}
-

{% translate "General" %}

+

{% translate "Motorized individual traffic" %}

-
{% translate "Overview" %}
+
{% translate "Vehicles" %}
-
+
+ {% translate "Zugelassene Fahrzeuge nach Antriebsart." noop %} +
{% translate "CO2 Emissions" %}
-
+
+ 1 t CO2 + = + XXX km {% translate "Distance" %} + + + + + +
+
+
+
+
+
+
+

{% translate "Abschätzung CO2-Emissionen" %}

+
+
+
+
{% translate "Sachsen-Anhalt und Abschätzung Region ABW" %}
+
+
+ {% translate "Die THG-Emissionen für die Region ABW werden näherungsweise anhand unterschiedlicher Kriterien und Datenquellen aus den Gesamtemissionen für Sachsen-Anhalt (THG-Bericht 2021) von 1990 und 2019 disaggregiert. Die sektorale Unterteilung orientiert sich an diesem Bericht.
Der energiebedingte Sektor stellt den größten Emissionsverursacher dar und gliedert sich hier in die Untersektoren Energiewirtschaft, Industrie, Verkehr sowie \"Sonstige Energie\" (insbesondere Gebäude)." noop %} +
+
+
+
{% translate "Abschätzung der Reduktion in der Region ABW" %}
+
+
+ {% translate "Hier folgt ein Beschreibungstext..." noop %}
diff --git a/digiplan/templates/forms/layer.html b/digiplan/templates/forms/layer.html index 6ce91bf6..7eb40594 100644 --- a/digiplan/templates/forms/layer.html +++ b/digiplan/templates/forms/layer.html @@ -4,7 +4,7 @@
-
+
diff --git a/digiplan/templates/forms/panel_energy.html b/digiplan/templates/forms/panel_energy.html index 7badd2a0..c422f0fc 100644 --- a/digiplan/templates/forms/panel_energy.html +++ b/digiplan/templates/forms/panel_energy.html @@ -4,50 +4,97 @@

{% trans "Generation" %}

{% include "widgets/slider.html" with field=form.s_w_1 %} -
-

+

+
{% trans "Detail settings" %} {% include "widgets/sidepanel_close_btn.html" %} -

{% trans "Set the use of wind potential areas." %}

- {% include "widgets/slider.html" with field=form.s_w_3 %} - {% include "widgets/slider.html" with field=form.s_w_4 %} - {% include "widgets/slider.html" with field=form.s_w_4_1 %} - {% include "widgets/slider.html" with field=form.s_w_4_2 %} - {% include "widgets/slider.html" with field=form.s_w_5 %} - {% include "widgets/slider.html" with field=form.s_w_5_1 %} - {% include "widgets/slider.html" with field=form.s_w_5_2 %} -

{% trans "With your settings, a maximum total output of 13 MW and a yield of 7 GWh can be realized.
The goals for Saxony-Anhalt from the Wind Energy Area Requirement Act are:
- for 2027 (1.4%) achieved.
- for 2032 (2.2%) achieved.

Tip: In the menu on the right you can display the systems that exist today." %}

+
+

+ {% trans "Set the use of wind potential areas." %}

+
+ + {% include "widgets/slider.html" with field=form.s_w_3 %} + +
+
+ + {% include "widgets/slider.html" with field=form.s_w_4 %} + + + {% include "widgets/slider.html" with field=form.s_w_4_1 %} + + + {% include "widgets/slider.html" with field=form.s_w_4_2 %} + +
+
+ + {% include "widgets/slider.html" with field=form.s_w_5 %} + + + {% include "widgets/slider.html" with field=form.s_w_5_1 %} + + + {% include "widgets/slider.html" with field=form.s_w_5_2 %} + +
+
+

{% trans "With your settings, a maximum total output of 13 MW and a yield of 7 GWh can be realized.
The goals for Saxony-Anhalt from the Wind Energy Area Requirement Act are:
- for 2027 (1.4%) achieved.
- for 2032 (2.2%) achieved.

Tip: In the menu on the right you can display the systems that exist today." %}

+
{% include "widgets/slider.html" with field=form.s_pv_ff_1 %} -
-

+

+
{% trans "Detail settings" %} {% include "widgets/sidepanel_close_btn.html" %} -

{% trans "Set the use of potential areas for ground-mounted PV." %}

- {% include "widgets/slider.html" with field=form.s_pv_ff_3 %} - {% include "widgets/slider.html" with field=form.s_pv_ff_4 %} -

{% trans "Mit Ihren Einstellungen kann eine maximale Gesamtleistung von 18 MW und ein Ertrag von 3 GWh realisiert werden.

Tipp: Im rechten Menü können Sie die heute bestehenden Anlagen einblenden." %}

+
+

+ {% trans "Set the use of potential areas for ground-mounted PV." %} +

+
+ + {% include "widgets/slider.html" with field=form.s_pv_ff_3 %} + +
+
+ + {% include "widgets/slider.html" with field=form.s_pv_ff_4 %} + +
+
+

{% trans "With your settings, a maximum total output of 18 MW and a yield of 3 GWh can be realized.

Tip: In the right-hand menu, you can display the systems that currently exist." %}

+

{% include "widgets/slider.html" with field=form.s_pv_d_1 %} -
-

+

+
{% trans "Detail settings" %} {% include "widgets/sidepanel_close_btn.html" %} -

{% trans "Set how much roof area should be used for photovoltaics." %}

- {% include "widgets/slider.html" with field=form.s_pv_d_3 %} - {% include "widgets/slider.html" with field=form.s_pv_d_4 %} -

{% trans "Mit Ihren Einstellungen kann eine maximale Gesamtleistung von 4 MW und ein Ertrag von 2 GWh realisiert werden. Die Aufteilung der Ausrichtung ist wie folgt:
- Süddächer: 3 %
- Westdächer: 3 %
- Norddächer: 3 %
- Ostdächer: 8 %
Denkmalgeschützte Gebäude werden nicht verwendet.

Tipp: Im rechten Menü können Sie die heute bestehenden Anlagen einblenden." %}

+
+

+ {% trans "Set how much roof area should be used for photovoltaics." %}

+
+ + {% include "widgets/slider.html" with field=form.s_pv_d_3 %} + +
+
+ + {% include "widgets/slider.html" with field=form.s_pv_d_4 %} + +
+
+

{% trans "With your settings, a maximum total output of 4 MW and a yield of 2 GWh can be realized. The distribution of the orientation is as follows:
- South roofs: 3%
- West roofs: 3%
- North roofs: 3%
- East roofs: 8%
Buildings under monument protection are not used.

Tip: In the menu on the right you can show the systems that exist today." %}

+
{% include "widgets/slider.html" with field=form.s_h_1 %} -{% include "widgets/slider.html" with field=form.s_b_1 %} -

{% trans "Consumption" %}

@@ -60,7 +107,7 @@

{% trans "Consumption" %}

{% include "widgets/slider.html" with field=form.s_v_3 %} {% include "widgets/slider.html" with field=form.s_v_4 %} {% include "widgets/slider.html" with field=form.s_v_5 %} -

{% trans "Mit Ihren Einstellungen beträgt der Stromverbrauch 42 % des heutigen Stromverbrauchs." %}

+

{% trans "With your settings, the power consumption is 42% of today's power consumption." %}

@@ -74,6 +121,6 @@

{% trans "Batteries" %}

{% include "widgets/sidepanel_close_btn.html" %}

{% trans "Set how much of the daily (on average) fed-in energy from wind energy and free-field PV should be able to be temporarily stored using large batteries." %}

{% include "widgets/slider.html" with field=form.s_s_g_3 %} -

{% trans "Mit Ihren Einstellungen können 73 % zwischengespeichert werden. Das entspricht einer Speicherkapazität von 17 GWh." %}

+

{% trans "With your settings, 73% can be cached. That corresponds to a storage capacity of 17 GWh." %}

diff --git a/digiplan/templates/forms/panel_heat.html b/digiplan/templates/forms/panel_heat.html index 882f37c2..625f692e 100644 --- a/digiplan/templates/forms/panel_heat.html +++ b/digiplan/templates/forms/panel_heat.html @@ -9,7 +9,7 @@

{% trans "Generation" %}

{% include "widgets/slider.html" with field=form.w_d_wp_3 %} {% include "widgets/slider.html" with field=form.w_d_wp_4 %} {% include "widgets/slider.html" with field=form.w_d_wp_5 %} -

{% trans "Mit Ihren Einstellungen beträgt der Anteil der mittels Wärmepumpen bereitgestellten Energiemenge 87 %. Die übrige Energie wird bereitgestellt durch:
- Direktelektrische Heizung: 10 %
- Bioenergie: 5 %
- Solarthermie: 20 %

Hinweis: Fernwärmesysteme werden links im Menü separat konfiguriert." %}

+

{% trans "With your settings, the proportion of energy provided by heat pumps is 87%. The remaining energy is provided by:
- Direct electric heating: 10%
- Bioenergy: 5%
- Solar thermal: 20%

Note: District heating systems are configured separately in the menu on the left." %}

@@ -20,7 +20,7 @@

{% trans "Generation" %}

{% include "widgets/sidepanel_close_btn.html" %}

{% trans "Set the share of heat pumps for all consumers with district heating connection. This includes households, tertiary and industrial customers in the Dessau-Roßlau, Bitterfeld-Wolfen, Köthen and Wittenberg district heating networks." %}

{% include "widgets/slider.html" with field=form.w_z_wp_3 %} -

{% trans "Mit Ihren Einstellungen beträgt der Anteil der mittels Wärmepumpen bereitgestellten Energiemenge 54 %. Die übrige Energie wird bereitgestellt durch:
- Direktelektrische Heizung: 12 %
- Bioenergie: 6 %
- Solarthermie: 52 %

Hinweis: Dezentrale Verbraucher werden links im Menü separat konfiguriert." %}

+

{% trans "With your settings, the proportion of energy provided by heat pumps is 54%. The remaining energy is provided by:
- Direct electric heating: 12%
- Bioenergy: 6%
- Solar thermal: 52%

Note: Decentralized consumers are configured separately in the menu on the left." %}

@@ -37,7 +37,7 @@

{% trans "Consumption" %}

{% include "widgets/slider.html" with field=form.w_v_3 %} {% include "widgets/slider.html" with field=form.w_v_4 %} {% include "widgets/slider.html" with field=form.w_v_5 %} -

{% trans "Mit Ihren Einstellungen beträgt der Wärmeverbrauch 27 % des heutigen Wärmeverbrauchs." %}

+

{% trans "With your settings, the heat consumption is 27% of today's heat consumption." %}

@@ -52,7 +52,7 @@

{% trans "Storage" %}

{% include "widgets/sidepanel_close_btn.html" %}

{% trans "Set how much of the daily heat requirement should be able to be temporarily stored in hot water tanks." %}

{% include "widgets/slider.html" with field=form.w_d_s_3 %} -

{% trans "Mit Ihren Einstellungen können 32 % des täglichen Wärmeverbrauchs zwischengespeichert werden. Das entspricht einer Speicherkapazität von 3 GWh" %}

+

{% trans "With your settings, 32% of the daily heat consumption can be temporarily stored. That corresponds to a storage capacity of 3 GWh" %}

@@ -63,6 +63,6 @@

{% trans "Storage" %}

{% include "widgets/sidepanel_close_btn.html" %}

{% trans "Set how much of the daily heat requirement should be able to be temporarily stored in hot water tanks." %}

{% include "widgets/slider.html" with field=form.w_z_s_3 %} -

{% trans "Mit Ihren Einstellungen können 34 % des täglichen Wärmeverbrauchs zwischengespeichert werden. Das entspricht einer Speicherkapazität von 5 GWh" %}

+

{% trans "With your settings, 57% of the daily heat consumption can be temporarily stored. That corresponds to a storage capacity of 5 GWh" %}

diff --git a/digiplan/templates/forms/panel_traffic.html b/digiplan/templates/forms/panel_traffic.html index 75673283..186ab0f9 100644 --- a/digiplan/templates/forms/panel_traffic.html +++ b/digiplan/templates/forms/panel_traffic.html @@ -7,6 +7,6 @@ {% include "widgets/sidepanel_close_btn.html" %}

{% trans "Set the share of electric vehicles in motorized private transport." %}

{% include "widgets/slider.html" with field=form.v_iv_3 %} -

{% trans "Mit Ihren Einstellungen sind 22 % der privaten Fahrzeuge (Kleinwagen, Mittelklasse, Oberklasse) elektrisch. Davon sind
- 10 % batterieelektrisch (BEV) und
- 4 % Plugin-Hybrid-Fahrzeuge." %}

+

{% trans "With your settings, 22% of private vehicles (compact, mid-size, full-size) are electric. Of these,
- 50% are battery electric (BEV) and
- 50% are plug-in hybrid vehicles." %}

diff --git a/digiplan/templates/map.html b/digiplan/templates/map.html index 5bfe9526..fcd6ca00 100644 --- a/digiplan/templates/map.html +++ b/digiplan/templates/map.html @@ -101,6 +101,8 @@ {{ mobility_ghg|json_script:"mobility_ghg" }} {{ overview_heat|json_script:"overview_heat" }} {{ decentralized_centralized_heat|json_script:"decentralized_centralized_heat" }} + {{ ghg_history|json_script:"ghg_history" }} + {{ ghg_reduction|json_script:"ghg_reduction" }} {{ settings_parameters|json_script:"settings_parameters" }} {{ settings_dependency_map|json_script:"settings_dependency_map" }} {{ dependency_parameters|json_script:"dependency_parameters" }} diff --git a/digiplan/templates/popups/base.html b/digiplan/templates/popups/base.html index bb9b2a20..7673b79a 100644 --- a/digiplan/templates/popups/base.html +++ b/digiplan/templates/popups/base.html @@ -8,11 +8,11 @@

{{ municipality }} {% block data %} - {% if data.region_value %} - ABW Region {{ data.region_value|floatformat:0 }} {{ data.unit }} + {% if region_value != None %} + ABW Region {{ region_value|floatformat:0 }}{% if unit %} {{ unit }}{% endif %} {% endif %} - {% if data.municipality_value %} - {{ municipality }}{{ data.municipality_value|floatformat:0 }} {{ data.unit }} + {% if municipality_value != None %} + {{ municipality }} {{ municipality_value|floatformat:0 }}{% if unit %} {{ unit }}{% endif %} {% endif %} {% endblock data%} @@ -20,7 +20,7 @@

{{ municipality }}{{ description }} + {% if description %}
{{ description }}
{% endif %} {% if sources %}
diff --git a/digiplan/templates/popups/cluster.html b/digiplan/templates/popups/cluster.html new file mode 100644 index 00000000..8784fec3 --- /dev/null +++ b/digiplan/templates/popups/cluster.html @@ -0,0 +1,22 @@ +{% load i18n %} +
+ +
+

{{ title }}

+
+ + + + + + + {% for key, value in data.items %} + + + + + {% endfor %} +
{% trans 'Parameter' %}{% trans 'Wert' %}
{{ key }}{{ value }}
+ + {% if description %}
{{ description }}
{% endif %} +
diff --git a/digiplan/utils/data_processing.py b/digiplan/utils/data_processing.py index db678e7a..91b415c4 100644 --- a/digiplan/utils/data_processing.py +++ b/digiplan/utils/data_processing.py @@ -1,39 +1,77 @@ -import math -import os - -import pandas - -from config.settings.base import DATA_DIR -from digiplan.map.models import ( - Biomass, - Combustion, - Hydro, - Municipality, - Population, - PVground, - PVroof, - Region, - WindTurbine, -) -from digiplan.utils.ogr_layer_mapping import RelatedModelLayerMapping +"""Module to load (geo-)data into digiplan models.""" -REGIONS = [Municipality] +import logging +import math +import pathlib +from typing import Optional -MODELS = [WindTurbine, PVroof, PVground, Hydro, Biomass, Combustion] +import pandas as pd +from django.db.models import Model +from config.settings.base import DIGIPIPE_DIR, DIGIPIPE_GEODATA_DIR +from digiplan.map import models +from digiplan.utils.ogr_layer_mapping import RelatedModelLayerMapping -def load_regions(regions=None, verbose=True): +REGIONS = [models.Municipality] + +MODELS = [ + # Clusters + models.WindTurbine, + models.PVroof, + models.PVground, + models.Hydro, + models.Biomass, + models.Combustion, + models.GSGK, + models.Storage, + # Static + models.AirTraffic, + models.Aviation, + models.BiosphereReserve, + models.DrinkingWaterArea, + models.FaunaFloraHabitat, + models.Floodplain, + models.Forest, + models.Grid, + models.Industry, + models.LandscapeProtectionArea, + models.LessFavouredAreasAgricultural, + models.Military, + models.NatureConservationArea, + models.Railway, + models.Road, + models.RoadRailway500m, + models.Settlement0m, + models.SoilQualityLow, + models.SoilQualityHigh, + models.SpecialProtectionArea, + models.Water, + # PotentialAreas + models.PotentialareaPVAgricultureLFAOff, + models.PotentialareaPVRoadRailway, + models.PotentialareaWindSTP2018Vreg, + models.PotentialareaWindSTP2027Repowering, + models.PotentialareaWindSTP2027SearchAreaForestArea, + models.PotentialareaWindSTP2027SearchAreaOpenArea, + models.PotentialareaWindSTP2027VR, +] + + +def load_regions(regions: Optional[list[Model]] = None, *, verbose: bool = True) -> None: + """Load region geopackages into region models.""" regions = regions or REGIONS for region in regions: if region.objects.exists(): - print(f"Skipping data for model '{region.__name__}' - Please empty model first if you want to update data.") + logging.info( + f"Skipping data for model '{region.__name__}' - Please empty model first if you want to update data.", + ) continue - print(f"Upload data for region '{region.__name__}'") + logging.info(f"Upload data for region '{region.__name__}'") if hasattr(region, "data_folder"): - data_path = os.path.join(DATA_DIR, region.data_folder, f"{region.data_file}.gpkg") + data_path = pathlib.Path(DIGIPIPE_GEODATA_DIR) / region.data_folder / f"{region.data_file}.gpkg" else: - data_path = os.path.join(DATA_DIR, f"{region.data_file}.gpkg") - region_model = Region(layer_type=region.__name__.lower()) + data_path = pathlib.Path(DIGIPIPE_GEODATA_DIR) / f"{region.data_file}.gpkg" + region_model = models.Region(layer_type=region.__name__.lower()) region_model.save() instance = RelatedModelLayerMapping( model=region, @@ -46,17 +84,20 @@ def load_regions(regions=None, verbose=True): instance.save(strict=True, verbose=verbose) -def load_data(models=None): +def load_data(models: Optional[list[Model]] = None) -> None: + """Load geopackage-based data into models.""" models = models or MODELS for model in models: if model.objects.exists(): - print(f"Skipping data for model '{model.__name__}' - Please empty model first if you want to update data.") + logging.info( + f"Skipping data for model '{model.__name__}' - Please empty model first if you want to update data.", + ) continue - print(f"Upload data for model '{model.__name__}'") + logging.info(f"Upload data for model '{model.__name__}'") if hasattr(model, "data_folder"): - data_path = os.path.join(DATA_DIR, model.data_folder, f"{model.data_file}.gpkg") + data_path = pathlib.Path(DIGIPIPE_GEODATA_DIR) / model.data_folder / f"{model.data_file}.gpkg" else: - data_path = os.path.join(DATA_DIR, f"{model.data_file}.gpkg") + data_path = pathlib.Path(DIGIPIPE_GEODATA_DIR) / f"{model.data_file}.gpkg" instance = RelatedModelLayerMapping( model=model, data=data_path, @@ -67,12 +108,13 @@ def load_data(models=None): instance.save(strict=True) -def load_population(): +def load_population() -> None: + """Load population data into Population model.""" filename = "population.csv" - path = os.path.join(DATA_DIR, filename) - municipalities = Municipality.objects.all() - dataframe = pandas.read_csv(path, header=[0, 1], index_col=0) + path = pathlib.Path(DIGIPIPE_DIR) / "scalars" / filename + municipalities = models.Municipality.objects.all() + dataframe = pd.read_csv(path, header=[0, 1], index_col=0) years = dataframe.columns.get_level_values(0) for municipality in municipalities: @@ -83,7 +125,7 @@ def load_population(): if math.isnan(value): continue - entry = Population( + entry = models.Population( year=year, value=value, entry_type=list(series.index.values)[0], @@ -92,7 +134,8 @@ def load_population(): entry.save() -def empty_data(models=None): +def empty_data(models: Optional[list[Model]] = None) -> None: + """Delete all data from given models.""" models = models or MODELS for model in models: model.objects.all().delete() diff --git a/digiplan/utils/distill.py b/digiplan/utils/distill.py index 6547fcc0..48a7273b 100644 --- a/digiplan/utils/distill.py +++ b/digiplan/utils/distill.py @@ -1,9 +1,13 @@ +"""Module holds helper function for distilling.""" + +import logging from collections import defaultdict from django_mapengine import distill -def check_distill_coordinates(): +def check_distill_coordinates() -> dict: + """Return coordinates for all static tiles.""" tiles = list(distill.get_coordinates_for_distilling("static")) coordinates = defaultdict(lambda: {"x": [None, None], "y": [None, None]}) for tile in tiles: @@ -20,4 +24,4 @@ def check_distill_coordinates(): if __name__ == "__main__": - print(check_distill_coordinates()) + logging.info(check_distill_coordinates()) diff --git a/digiplan/utils/ogr_layer_mapping.py b/digiplan/utils/ogr_layer_mapping.py index 48a2815c..d0dbb5c6 100644 --- a/digiplan/utils/ogr_layer_mapping.py +++ b/digiplan/utils/ogr_layer_mapping.py @@ -12,7 +12,7 @@ def check_layer(self): # noqa: C901 Check the Layer metadata and ensure that it's compatible with the mapping information and model. Unlike previous revisions, there is no need to increment through each feature in the Layer. - """ # noqa: DAR401,DAR101,DAR201 + """ # The geometry field of the model is set here. # TODO: Support more than one geometry field / model. However, this # depends on the GDAL Driver in use. @@ -47,16 +47,14 @@ def check_ogr_fld(ogr_map_fld): if isinstance(model_field, GeometryField): if self.geom_field: - raise LayerMapError("LayerMapping does not support more than one GeometryField per model.") + msg = "LayerMapping does not support more than one GeometryField per model." + raise LayerMapError(msg) # Getting the coordinate dimension of the geometry field. coord_dim = model_field.dim try: - if coord_dim == 3: - gtype = OGRGeomType(ogr_name + "25D") - else: - gtype = OGRGeomType(ogr_name) + gtype = OGRGeomType(ogr_name + "25D") if coord_dim == 3 else OGRGeomType(ogr_name) except GDALException: raise LayerMapError('Invalid mapping for GeometryField "%s".' % field_name) @@ -64,8 +62,8 @@ def check_ogr_fld(ogr_map_fld): ltype = self.layer.geom_type if not (ltype.name.startswith(gtype.name) or self.make_multi(ltype, model_field)): raise LayerMapError( - "Invalid mapping geometry; model has %s%s, " - "layer geometry type is %s." % (fld_name, "(dim=3)" if coord_dim == 3 else "", ltype) + "Invalid mapping geometry; model has {}{}, " + "layer geometry type is {}.".format(fld_name, "(dim=3)" if coord_dim == 3 else "", ltype), ) # Setting the `geom_field` attribute w/the name of the model field @@ -85,12 +83,12 @@ def check_ogr_fld(ogr_map_fld): rel_model._meta.get_field(rel_name.split("__")[0]) except FieldDoesNotExist: raise LayerMapError( - 'ForeignKey mapping field "%s" not in %s fields.' - % (rel_name, rel_model.__class__.__name__) + f'ForeignKey mapping field "{rel_name}" not in {rel_model.__class__.__name__} fields.', ) fields_val = rel_model else: - raise TypeError("ForeignKey mapping must be of dictionary type.") + msg = "ForeignKey mapping must be of dictionary type." + raise TypeError(msg) else: # Is the model field type supported by LayerMapping? if model_field.__class__ not in self.FIELD_TYPES: @@ -106,8 +104,8 @@ def check_ogr_fld(ogr_map_fld): # Can the OGR field type be mapped to the Django field type? if not issubclass(ogr_field, self.FIELD_TYPES[model_field.__class__]): raise LayerMapError( - 'OGR field "%s" (of type %s) cannot be mapped to Django %s.' - % (ogr_field, ogr_field.__name__, fld_name) + f'OGR field "{ogr_field}" (of type {ogr_field.__name__}) ' + f"cannot be mapped to Django {fld_name}.", ) fields_val = model_field @@ -117,7 +115,7 @@ def verify_fk(self, feat, rel_model, rel_mapping): """ Given an OGR Feature, the related model and its dictionary mapping, retrieve the related model for the ForeignKey mapping. - """ # noqa: DAR401,DAR101,DAR201 + """ # TODO: It is expensive to retrieve a model for every record -- # explore if an efficient mechanism exists for caching related # ForeignKey models. @@ -126,7 +124,8 @@ def verify_fk(self, feat, rel_model, rel_mapping): fk_kwargs = {} for field_name, ogr_name in rel_mapping.items(): fk_kwargs[field_name] = self.verify_ogr_field( - feat[ogr_name], rel_model._meta.get_field(field_name.split("__")[0]) + feat[ogr_name], + rel_model._meta.get_field(field_name.split("__")[0]), ) # Attempting to retrieve and return the related model. @@ -140,7 +139,7 @@ def feature_kwargs(self, feat): """ Given an OGR Feature, return a dictionary of keyword arguments for constructing the mapped model. - """ # noqa: DAR401,DAR101,DAR201 + """ # The keyword arguments for model construction. kwargs = {} @@ -154,7 +153,8 @@ def feature_kwargs(self, feat): try: val = self.verify_geom(feat.geom, model_field) except GDALException: - raise LayerMapError("Could not retrieve geometry from feature.") + msg = "Could not retrieve geometry from feature." + raise LayerMapError(msg) elif isinstance(model_field, models.base.ModelBase): # The related _model_, not a field was passed in -- indicating # another mapping for the related Model. diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 55fff0b4..a46d98cb 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -3,12 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy +#: config/settings/base.py:352 config/settings/base.py:357 +#: config/settings/base.py:359 config/settings/base.py:360 +#: config/settings/base.py:368 config/settings/base.py:373 +#: digiplan/map/charts.py:515 digiplan/map/charts.py:533 +#: digiplan/map/charts.py:706 digiplan/map/popups.py:387 +#: digiplan/map/popups.py:409 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-18 17:49+0000\n" +"POT-Creation-Date: 2023-07-13 11:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,224 +23,746 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: config/settings/base.py:34 +#: config/settings/base.py:36 msgid "English" msgstr "Englisch" -#: config/settings/base.py:35 +#: config/settings/base.py:37 msgid "German" msgstr "Deutsch" -#: digiplan/map/map_config.py:7 -msgid "Renewables" -msgstr "Erneuerbare Energien" +#: config/settings/base.py:352 +msgid "Einwohner_innenzahl" +msgstr "" -#: digiplan/map/map_config.py:8 digiplan/map/models.py:219 -msgid "Wind turbine" +#: config/settings/base.py:356 +msgid "Einwohner_innenzahl pro km²" +msgstr "" + +#: config/settings/base.py:359 digiplan/map/popups.py:374 +#: digiplan/map/popups.py:386 +#: digiplan/templates/components/panel_1_today.html:44 +msgid "Beschäftigte" +msgstr "" + +#: config/settings/base.py:360 digiplan/map/popups.py:396 +#: digiplan/map/popups.py:408 +#: digiplan/templates/components/panel_1_today.html:45 +msgid "Betriebe" +msgstr "" + +#: config/settings/base.py:361 +msgid "Installierte Leistung" +msgstr "" + +#: config/settings/base.py:361 config/settings/base.py:366 +#: digiplan/map/charts.py:569 +msgid "MW" +msgstr "" + +#: config/settings/base.py:365 +msgid "Installierte Leistung pro qm" +msgstr "" + +#: config/settings/base.py:368 +#| msgid "Wind turbine" +msgid "Anzahl Windturbinen" msgstr "Windturbine" -#: digiplan/map/map_config.py:9 digiplan/map/models.py:369 -#: digiplan/static/config/energy_settings_panel.json:89 -msgid "Roof-mounted PV" -msgstr "Aufdach-PV" +#: config/settings/base.py:372 +msgid "Anzahl Windturbinen pro qm" +msgstr "" + +#: config/settings/base.py:378 config/settings/base.py:384 +msgid "Energie Erneuerbare" +msgstr "" + +#: config/settings/base.py:379 config/settings/base.py:385 +#: config/settings/base.py:421 config/settings/base.py:433 +#: digiplan/map/charts.py:586 digiplan/map/charts.py:723 +#: digiplan/map/charts.py:762 digiplan/map/popups.py:207 +#: digiplan/map/popups.py:224 digiplan/map/popups.py:284 +#: digiplan/map/popups.py:500 +msgid "GWh" +msgstr "" + +#: config/settings/base.py:390 +msgid "Anteil Erneuerbare Energien am Strombedarf" +msgstr "" + +#: config/settings/base.py:391 digiplan/map/charts.py:623 +#: digiplan/map/popups.py:248 +msgid "%" +msgstr "" + +#: config/settings/base.py:396 config/settings/base.py:402 +msgid "Gewonnene Energie aus EE je EW" +msgstr "" + +#: config/settings/base.py:397 config/settings/base.py:403 +#: config/settings/base.py:409 config/settings/base.py:415 +#: config/settings/base.py:451 digiplan/map/charts.py:605 +#: digiplan/map/charts.py:645 digiplan/map/charts.py:667 +#: digiplan/map/popups.py:265 digiplan/map/popups.py:310 +#: digiplan/map/popups.py:329 digiplan/map/popups.py:560 +msgid "MWh" +msgstr "" + +#: config/settings/base.py:408 config/settings/base.py:414 +msgid "Gewonnene Energie aus EE je km²" +msgstr "" + +#: config/settings/base.py:420 digiplan/map/popups.py:457 +#: digiplan/map/popups.py:465 +msgid "Strombedarf" +msgstr "" + +#: config/settings/base.py:426 +msgid "Strombedarf pro EinwohnerIn" +msgstr "" + +#: config/settings/base.py:427 config/settings/base.py:439 +#: digiplan/map/charts.py:745 digiplan/map/charts.py:784 +#: digiplan/map/popups.py:483 digiplan/map/popups.py:517 +msgid "kWh" +msgstr "" + +#: config/settings/base.py:432 digiplan/map/popups.py:491 +#: digiplan/map/popups.py:499 +msgid "Wärmebedarf" +msgstr "" + +#: config/settings/base.py:438 +msgid "Wärmebedarf pro EinwohnerIn" +msgstr "" + +#: config/settings/base.py:444 digiplan/map/popups.py:525 +#: digiplan/map/popups.py:537 +#: digiplan/templates/components/panel_1_today.html:97 +msgid "Anzahl Batteriespeicher" +msgstr "" + +#: config/settings/base.py:445 digiplan/map/charts.py:801 +#: digiplan/map/charts.py:819 digiplan/map/popups.py:538 +msgid "#" +msgstr "" + +#: config/settings/base.py:450 digiplan/map/popups.py:547 +#: digiplan/map/popups.py:559 +#: digiplan/templates/components/panel_1_today.html:98 +msgid "Kapazität Batteriespeicher" +msgstr "" -#: digiplan/map/map_config.py:10 digiplan/map/models.py:406 +#: digiplan/map/calculations.py:196 digiplan/map/calculations.py:218 +#: digiplan/map/config.py:184 +#| msgid "Electricity Demand" +msgid "Electricity Household Demand" +msgstr "Strombedarf" + +#: digiplan/map/calculations.py:197 digiplan/map/calculations.py:219 +#: digiplan/map/config.py:185 +#| msgid "Electricity Demand" +msgid "Electricity CTS Demand" +msgstr "Strombedarf" + +#: digiplan/map/calculations.py:198 digiplan/map/calculations.py:220 +#: digiplan/map/config.py:186 +#| msgid "Electricity Demand" +msgid "Electricity Industry Demand" +msgstr "Strombedarf" + +#: digiplan/map/charts.py:498 +msgid "EW/km²" +msgstr "" + +#: digiplan/map/config.py:174 digiplan/map/map_config.py:33 +#: digiplan/map/models.py:212 msgid "Outdoor PV" msgstr "Freiflächen-PV" -#: digiplan/map/map_config.py:11 digiplan/map/models.py:440 -#: digiplan/map/models.py:441 +#: digiplan/map/config.py:175 digiplan/map/map_config.py:27 +#: digiplan/map/models.py:184 +#: digiplan/static/config/energy_settings_panel.json:112 +msgid "Roof-mounted PV" +msgstr "Aufdach-PV" + +#: digiplan/map/config.py:176 digiplan/map/map_config.py:20 +#: digiplan/map/models.py:142 +msgid "Wind turbine" +msgstr "Windturbine" + +#: digiplan/map/config.py:177 digiplan/map/map_config.py:34 +#: digiplan/map/models.py:236 digiplan/map/models.py:237 msgid "Hydro" msgstr "Wasserkraft" -#: digiplan/map/map_config.py:12 digiplan/map/models.py:474 -#: digiplan/map/models.py:475 +#: digiplan/map/config.py:178 digiplan/map/map_config.py:35 +#: digiplan/map/models.py:260 digiplan/map/models.py:261 msgid "Biomass" msgstr "Biomasse" -#: digiplan/map/map_config.py:13 digiplan/map/models.py:508 -#: digiplan/map/models.py:509 +#: digiplan/map/config.py:183 +msgid "BEV" +msgstr "" + +#: digiplan/map/config.py:187 +#| msgid "Electricity Demand" +msgid "Electricity Household Heat Demand" +msgstr "Strombedarf" + +#: digiplan/map/config.py:188 +#| msgid "Electricity Demand" +msgid "Electricity CTS Heat Demand" +msgstr "Strombedarf" + +#: digiplan/map/config.py:189 +#| msgid "Electricity Demand" +msgid "Electricity Industry Heat Demand" +msgstr "Strombedarf" + +#: digiplan/map/config.py:191 +#| msgid "Heat Demand (GWh)" +msgid "CTS Heat Demand" +msgstr "Wärmebedarf (GWh)" + +#: digiplan/map/config.py:192 +msgid "Household Heat Demand" +msgstr "" + +#: digiplan/map/config.py:193 +#| msgid "Energy Demand" +msgid "Industry Heat Demand" +msgstr "Strombedarf" + +#: digiplan/map/map_config.py:18 +msgid "Renewables" +msgstr "Erneuerbare Energien" + +#: digiplan/map/map_config.py:21 digiplan/map/map_config.py:35 +#: digiplan/map/map_config.py:38 digiplan/map/map_config.py:43 +#: digiplan/map/map_config.py:44 +#| msgid "Wind turbine" +msgid "Wind turbine layer" +msgstr "Windturbine" + +#: digiplan/map/map_config.py:28 +msgid "PV roof layer" +msgstr "" + +#: digiplan/map/map_config.py:33 digiplan/map/map_config.py:34 +#| msgid "Hydro" +msgid "Hydro layer" +msgstr "Wasserkraft" + +#: digiplan/map/map_config.py:37 digiplan/map/models.py:284 +#: digiplan/map/models.py:285 msgid "Combustion" msgstr "Fossiles Kraftwerk" -#: digiplan/map/models.py:30 +#: digiplan/map/map_config.py:43 digiplan/map/models.py:308 +#: digiplan/map/models.py:309 +msgid "GSGK" +msgstr "" + +#: digiplan/map/map_config.py:44 digiplan/map/models.py:329 +#: digiplan/templates/forms/panel_heat.html:46 +msgid "Storage" +msgstr "" + +#: digiplan/map/map_config.py:46 +msgid "Settlements Infrastructure" +msgstr "" + +#: digiplan/map/map_config.py:47 +msgid "Settlement 0m" +msgstr "" + +#: digiplan/map/map_config.py:47 digiplan/map/map_config.py:48 +#: digiplan/map/map_config.py:49 digiplan/map/map_config.py:50 +#: digiplan/map/map_config.py:51 digiplan/map/map_config.py:52 +#: digiplan/map/map_config.py:54 digiplan/map/map_config.py:55 +#| msgid "Situation today" +msgid "Aviation layer" +msgstr "Situation heute" + +#: digiplan/map/map_config.py:48 +#| msgid "Industry (%%)" +msgid "Industry" +msgstr "Industrie (%%)" + +#: digiplan/map/map_config.py:49 +msgid "Road Railway 500m" +msgstr "" + +#: digiplan/map/map_config.py:50 +msgid "Road" +msgstr "" + +#: digiplan/map/map_config.py:51 +msgid "Railway" +msgstr "" + +#: digiplan/map/map_config.py:52 +msgid "Aviation" +msgstr "" + +#: digiplan/map/map_config.py:53 +msgid "Air Traffic" +msgstr "" + +#: digiplan/map/map_config.py:53 +msgid "Air traffic layer" +msgstr "" + +#: digiplan/map/map_config.py:54 +msgid "Military" +msgstr "" + +#: digiplan/map/map_config.py:55 +msgid "Grid" +msgstr "" + +#: digiplan/map/map_config.py:57 +msgid "Nature Landscape" +msgstr "" + +#: digiplan/map/map_config.py:58 +msgid "Nature Conservation Area" +msgstr "" + +#: digiplan/map/map_config.py:58 digiplan/map/map_config.py:59 +#: digiplan/map/map_config.py:60 digiplan/map/map_config.py:62 +#: digiplan/map/map_config.py:63 digiplan/map/map_config.py:66 +#: digiplan/map/map_config.py:69 digiplan/map/map_config.py:70 +#: digiplan/map/map_config.py:71 digiplan/map/map_config.py:72 +msgid "layer info" +msgstr "" + +#: digiplan/map/map_config.py:59 +msgid "Fauna Flora Habitat" +msgstr "" + +#: digiplan/map/map_config.py:60 +msgid "Special Protection Area" +msgstr "" + +#: digiplan/map/map_config.py:61 +msgid "Biosphere Reserve" +msgstr "" + +#: digiplan/map/map_config.py:61 +msgid "Biosphere Reserve layer" +msgstr "" + +#: digiplan/map/map_config.py:62 +msgid "Landscape Protection Area" +msgstr "" + +#: digiplan/map/map_config.py:63 +msgid "Forest" +msgstr "" + +#: digiplan/map/map_config.py:65 +msgid "Drinking Water Protection Area" +msgstr "" + +#: digiplan/map/map_config.py:69 +msgid "Water" +msgstr "" + +#: digiplan/map/map_config.py:70 +msgid "Floodplain" +msgstr "" + +#: digiplan/map/map_config.py:71 +msgid "Soil Quality High" +msgstr "" + +#: digiplan/map/map_config.py:72 +msgid "Soil Quality Low" +msgstr "" + +#: digiplan/map/models.py:20 msgid "Country" msgstr "Land" -#: digiplan/map/models.py:31 +#: digiplan/map/models.py:21 msgid "State" msgstr "Bundesland" -#: digiplan/map/models.py:32 +#: digiplan/map/models.py:22 msgid "District" msgstr "Kreis" -#: digiplan/map/models.py:33 digiplan/map/models.py:58 +#: digiplan/map/models.py:23 digiplan/map/models.py:50 msgid "Municipality" msgstr "Gemeinde" -#: digiplan/map/models.py:38 +#: digiplan/map/models.py:28 msgid "Region" msgstr "Region" -#: digiplan/map/models.py:39 +#: digiplan/map/models.py:29 msgid "Regions" msgstr "Regionen" -#: digiplan/map/models.py:59 +#: digiplan/map/models.py:51 msgid "Municipalities" msgstr "Gemeinden" -#: digiplan/map/models.py:77 digiplan/map/models.py:78 +#: digiplan/map/models.py:79 digiplan/map/models.py:80 #: digiplan/templates/components/panel_1_today.html:39 #: digiplan/templates/components/panel_3_results.html:34 msgid "Population" msgstr "Bevölkerung" -#: digiplan/map/models.py:220 +#: digiplan/map/models.py:143 msgid "Wind turbines" msgstr "Windturbine" -#: digiplan/map/models.py:370 +#: digiplan/map/models.py:185 msgid "Roof-mounted PVs" msgstr "Aufdach-PVs" -#: digiplan/map/models.py:407 +#: digiplan/map/models.py:213 msgid "Outdoor PVs" msgstr "Freiflächen-PVs" -#: digiplan/map/results/visualizations.py:10 -msgid "Total Costs" -msgstr "Gesamtkosten" +#: digiplan/map/models.py:330 +msgid "Storages" +msgstr "" -#: digiplan/map/results/visualizations.py:31 -msgid "Electricity Demand" -msgstr "Strombedarf" +#: digiplan/map/popups.py:189 +msgid "Installed capacities per square meter" +msgstr "" + +#: digiplan/map/popups.py:190 +msgid "MW/km²" +msgstr "" + +#: digiplan/map/popups.py:198 digiplan/map/popups.py:215 +msgid "Energies" +msgstr "" + +#: digiplan/map/popups.py:206 digiplan/map/popups.py:223 +msgid "Energies per technology" +msgstr "" + +#: digiplan/map/popups.py:239 +msgid "Energie Shares" +msgstr "" + +#: digiplan/map/popups.py:247 +msgid "Energy shares per technology" +msgstr "" + +#: digiplan/map/popups.py:256 digiplan/map/popups.py:273 +msgid "Gewonnene Energie pro EW" +msgstr "" + +#: digiplan/map/popups.py:264 +msgid "Energy per capita per technology" +msgstr "" + +#: digiplan/map/popups.py:283 +msgid "Energies per capita per technology" +msgstr "" + +#: digiplan/map/popups.py:301 digiplan/map/popups.py:318 +#: digiplan/map/popups.py:328 +msgid "Gewonnene Energie pro km²" +msgstr "" + +#: digiplan/map/popups.py:309 +msgid "Energie pro km²" +msgstr "" + +#: digiplan/map/popups.py:365 +#| msgid "Population Density" +msgid "Population density per year" +msgstr "Bevölkerungsdichte" + +#: digiplan/map/popups.py:366 +msgid "Pop/km²" +msgstr "" + +#: digiplan/map/popups.py:418 +#| msgid "Number of Wind Turbines per km²" +msgid "Number of wind turbines" +msgstr "Anzahl Windenergieanlagen je km²" + +#: digiplan/map/popups.py:419 +#| msgid "Number of Wind Turbines per km²" +msgid "Description for number of wind turbines" +msgstr "Anzahl Windenergieanlagen je km²" + +#: digiplan/map/popups.py:444 +#| msgid "Wind turbines" +msgid "Wind turbines per square meter" +msgstr "Windturbine" + +#: digiplan/map/popups.py:445 +msgid "WT/km²" +msgstr "" + +#: digiplan/map/popups.py:466 +msgid "ǴWh" +msgstr "" + +#: digiplan/map/popups.py:474 digiplan/map/popups.py:482 +msgid "Strombedarf je EinwohnerIn" +msgstr "" + +#: digiplan/map/popups.py:508 digiplan/map/popups.py:516 +msgid "Wärmebedarf je EinwohnerIn" +msgstr "" #: digiplan/static/config/energy_settings_panel.json:6 -#: digiplan/static/config/energy_settings_panel.json:12 -#, fuzzy #| msgid "Wind energy" msgid "Wind energy (MW)" msgstr "Windenergie" +#: digiplan/static/config/energy_settings_panel.json:12 +msgid "" +"The use of wind potential areas can be set here.\\nNote: Since the setting " +"always refers to future, more profitable systems, maintaining the current " +"system capacity also leads to increases in yield." +msgstr "" + +#: digiplan/static/config/energy_settings_panel.json:18 #: digiplan/static/config/energy_settings_panel.json:19 +msgid "Only previous priority areas/suitable areas." +msgstr "" + #: digiplan/static/config/energy_settings_panel.json:24 -#, fuzzy -#| msgid "Distance from residential areas" -msgid "Distance from residential areas (m)" -msgstr "Siedlungsabstand" +#: digiplan/static/config/energy_settings_panel.json:25 +msgid "Priority areas according to STP Wind 2027." +msgstr "" -#: digiplan/static/config/energy_settings_panel.json:29 -#: digiplan/static/config/energy_settings_panel.json:34 -#, python-format -msgid "Forest usage (%%)" -msgstr "Waldnutzungsfläche (%%)" +#: digiplan/static/config/energy_settings_panel.json:30 +#: digiplan/static/config/energy_settings_panel.json:31 +msgid "Priority areas." +msgstr "" -#: digiplan/static/config/energy_settings_panel.json:39 -#: digiplan/static/config/energy_settings_panel.json:44 -#, fuzzy, python-format -#| msgid "LSG usage" -msgid "LSG usage (%%)" -msgstr "LSG-Nutzung" +#: digiplan/static/config/energy_settings_panel.json:36 +#: digiplan/static/config/energy_settings_panel.json:37 +msgid "Priority areas repowering." +msgstr "" + +#: digiplan/static/config/energy_settings_panel.json:42 +#: digiplan/static/config/energy_settings_panel.json:43 +msgid "Free extension in the search area." +msgstr "" + +#: digiplan/static/config/energy_settings_panel.json:48 +#: digiplan/static/config/energy_settings_panel.json:49 +msgid "Use of open country search area." +msgstr "" + +#: digiplan/static/config/energy_settings_panel.json:59 +#: digiplan/static/config/energy_settings_panel.json:60 +msgid "Use of forest search space." +msgstr "" -#: digiplan/static/config/energy_settings_panel.json:51 -#: digiplan/static/config/energy_settings_panel.json:57 +#: digiplan/static/config/energy_settings_panel.json:72 +#: digiplan/static/config/energy_settings_panel.json:78 msgid "Outdoor PV (MW)" msgstr "Freiflächen-PV (MW)" -#: digiplan/static/config/energy_settings_panel.json:63 -#: digiplan/static/config/energy_settings_panel.json:64 -msgid "Areas alongside highways and railways" +#: digiplan/static/config/energy_settings_panel.json:84 +#: digiplan/static/config/energy_settings_panel.json:89 +#| msgid "Areas alongside highways and railways" +msgid "Areas along the federal motorway and rail routes (%%)" msgstr "Flächen entlang Autobahnen und Schienenwegen" -#: digiplan/static/config/energy_settings_panel.json:69 -#: digiplan/static/config/energy_settings_panel.json:70 -msgid "Use of agricultural ad grassland areas" +#: digiplan/static/config/energy_settings_panel.json:94 +#: digiplan/static/config/energy_settings_panel.json:99 +#| msgid "Use of agricultural ad grassland areas" +msgid "Use of agricultural and grassland areas (%%)" msgstr "Nutzung von Agrar- und Grünlandflächen" -#: digiplan/static/config/energy_settings_panel.json:75 -#: digiplan/static/config/energy_settings_panel.json:76 -msgid "Remove restrictions on disadvantaged areas." -msgstr "Begrenzung auf benachteiligte Gebiete aufheben" - -#: digiplan/static/config/energy_settings_panel.json:83 +#: digiplan/static/config/energy_settings_panel.json:106 msgid "Roof-mounted PV (MW)" msgstr "Aufdach-PV" -#: digiplan/static/config/energy_settings_panel.json:95 -#, fuzzy, python-format +#: digiplan/static/config/energy_settings_panel.json:118 +#: digiplan/static/config/energy_settings_panel.json:123 #| msgid "Share of used roofs (%)" msgid "Share of used roofs (%%)" msgstr "Anteil genutzter Dächer (%%)" -#: digiplan/static/config/energy_settings_panel.json:100 +#: digiplan/static/config/energy_settings_panel.json:128 +#: digiplan/static/config/energy_settings_panel.json:133 #, python-format -msgid "Anteil genutzter Dächer (%%)" +msgid "Proportion of photovoltaic systems with electricity storage (%%)" msgstr "" -#: digiplan/static/config/energy_settings_panel.json:106 -#: digiplan/static/config/energy_settings_panel.json:112 -msgid "Bioenergy (MW)" -msgstr "Bioenergie (MW)" +#: digiplan/static/config/energy_settings_panel.json:139 +#| msgid "Outdoor PV (MW)" +msgid "Hydropower (MW)" +msgstr "Freiflächen-PV (MW)" -#: digiplan/static/config/energy_settings_panel.json:118 -#: digiplan/static/config/energy_settings_panel.json:124 -msgid "Conventional Energy (MW)" -msgstr "Konventionell (MW)" +#: digiplan/static/config/energy_settings_panel.json:145 +msgid "Run-of-river power plants" +msgstr "" -#: digiplan/static/config/energy_settings_panel.json:130 -#: digiplan/static/config/energy_settings_panel.json:136 -#, fuzzy, python-format +#: digiplan/static/config/energy_settings_panel.json:151 #| msgid "Power consumption without heat generation (%%)" msgid "Power consumption without heat generation (%%)" msgstr "Stromverbrauch, ohne Wärmeerzeugung (%%)" -#: digiplan/static/config/energy_settings_panel.json:148 -#, fuzzy, python-format +#: digiplan/static/config/energy_settings_panel.json:157 +#| msgid "Power consumption without heat generation (%%)" +msgid "" +"Power consumption without providing heat using power-to-heat (e.g. heat " +"pumps)" +msgstr "Stromverbrauch, ohne Wärmeerzeugung (%%)" + +#: digiplan/static/config/energy_settings_panel.json:164 +#: digiplan/static/config/heat_settings_panel.json:17 +#: digiplan/static/config/heat_settings_panel.json:87 +#| msgid "Households (%%)" +msgid "Households (%%)" +msgstr "Haushalte (%%)" + +#: digiplan/static/config/energy_settings_panel.json:169 #| msgid "Households (%%)" msgid "Haushalte (%%)" msgstr "Haushalte (%%)" -#: digiplan/static/config/energy_settings_panel.json:153 +#: digiplan/static/config/energy_settings_panel.json:174 +#: digiplan/static/config/energy_settings_panel.json:179 +#: digiplan/static/config/heat_settings_panel.json:28 +#: digiplan/static/config/heat_settings_panel.json:98 #, python-format msgid "Commercial, Trade, Services (%%)" msgstr "Gewerbe, Handel, Dienstleistungen (%%)" -#: digiplan/static/config/energy_settings_panel.json:163 -#: digiplan/static/config/energy_settings_panel.json:168 -#, python-format +#: digiplan/static/config/energy_settings_panel.json:184 +#: digiplan/static/config/energy_settings_panel.json:189 +#: digiplan/static/config/heat_settings_panel.json:39 +#: digiplan/static/config/heat_settings_panel.json:109 +#| msgid "Industry (%%)" msgid "Industry (%%)" msgstr "Industrie (%%)" -#: digiplan/static/config/energy_settings_panel.json:173 -#: digiplan/static/config/energy_settings_panel.json:179 -#, python-format -msgid "Home batteries (%%)" -msgstr "Heimspeicher (%%)" - -#: digiplan/static/config/energy_settings_panel.json:184 -#: digiplan/static/config/energy_settings_panel.json:190 -msgid "Large scale batteries (GWh)" +#: digiplan/static/config/energy_settings_panel.json:194 +#: digiplan/static/config/energy_settings_panel.json:200 +#| msgid "Large scale batteries (GWh)" +msgid "Large scale batteries (MWh)" msgstr "Großspeicher (GWh)" +#: digiplan/static/config/energy_settings_panel.json:206 +#: digiplan/static/config/energy_settings_panel.json:211 +#, python-format +msgid "Storage of wind and PV energy (%%)" +msgstr "" + #: digiplan/static/config/heat_settings_panel.json:5 -#: digiplan/static/config/heat_settings_panel.json:11 +#: digiplan/static/config/heat_settings_panel.json:121 #, python-format -msgid "Decentralized: share of households with heat pumps (%%)" -msgstr "Dezentral: Anteil Haushalte mit Wärmepumpe (%%)" +msgid "Decentralized (%%)" +msgstr "" + +#: digiplan/static/config/heat_settings_panel.json:11 +msgid "Decentralized heat supply" +msgstr "" -#: digiplan/static/config/heat_settings_panel.json:17 #: digiplan/static/config/heat_settings_panel.json:23 -#, python-format -msgid "Decentralized: share of households with solar thermal energy (%%)" -msgstr "Dezentral, Anteil Haushalte mit Solartherme (%%)" +#| msgid "" +#| "Set the share of heat pumps for consumers with their own heat generation " +#| "per sector." +msgid "" +"Heat pumps for heating and hot water in households with their own heat " +"generation" +msgstr "" +"Stellen Sie den Anteil von Wärmepumpen für Verbraucher mit eigener " +"Wärmeerzeugung je Sektor ein." + +#: digiplan/static/config/heat_settings_panel.json:34 +msgid "" +"Heat pumps for heating and hot water in the commercial, retail and service " +"sectors with their own heat generation." +msgstr "" -#: digiplan/static/config/heat_settings_panel.json:29 -#: digiplan/static/config/heat_settings_panel.json:35 +#: digiplan/static/config/heat_settings_panel.json:45 +msgid "" +"Heat pumps for heating, hot water and process heat in industry with their " +"own heat generation." +msgstr "" + +#: digiplan/static/config/heat_settings_panel.json:51 #, python-format -msgid "Centralized: Share of large scale heat pumps (%%)" -msgstr "Zentral: Anteil Großwärmepumpen (%%)" +msgid "District heating (%%)" +msgstr "" + +#: digiplan/static/config/heat_settings_panel.json:57 +msgid "District heating supply" +msgstr "" + +#: digiplan/static/config/heat_settings_panel.json:63 +#| msgid "LSG usage" +msgid "Share (%%)" +msgstr "LSG-Nutzung" + +#: digiplan/static/config/heat_settings_panel.json:69 +msgid "" +"Heat pumps for heating, hot water and process heat in district heating " +"networks" +msgstr "" + +#: digiplan/static/config/heat_settings_panel.json:75 +#| msgid "Consumption" +msgid "Heat consumption (%%)" +msgstr "Verbrauch" + +#: digiplan/static/config/heat_settings_panel.json:81 +msgid "" +"Heat consumption of decentralized heat generators and district heating " +"networks" +msgstr "" + +#: digiplan/static/config/heat_settings_panel.json:93 +msgid "" +"Includes heating and hot water in households with their own heat generation " +"and households in district heating networks." +msgstr "" + +#: digiplan/static/config/heat_settings_panel.json:104 +msgid "" +"Comprises heating and hot water in the commercial, retail and services " +"sector with its own heat generation and in district heating networks." +msgstr "" + +#: digiplan/static/config/heat_settings_panel.json:115 +msgid "" +"Includes thermal heat, hot water and process heat in industry with its own " +"heat generation and in district heating networks.." +msgstr "" + +#: digiplan/static/config/heat_settings_panel.json:127 +msgid "Storage in the decentralized heat supply" +msgstr "" + +#: digiplan/static/config/heat_settings_panel.json:133 +#: digiplan/static/config/heat_settings_panel.json:157 +#| msgid "Home batteries (%%)" +msgid "Hot water tanks (%%)" +msgstr "Heimspeicher (%%)" + +#: digiplan/static/config/heat_settings_panel.json:139 +#: digiplan/static/config/heat_settings_panel.json:163 +msgid "Hot water tanks for heating, hot water and process heat" +msgstr "" + +#: digiplan/static/config/heat_settings_panel.json:145 +#| msgid "Forest usage (%%)" +msgid "Large heat storage (%%)" +msgstr "Waldnutzungsfläche (%%)" + +#: digiplan/static/config/heat_settings_panel.json:151 +msgid "Storage in the district heating supply" +msgstr "" #: digiplan/static/config/traffic_settings_panel.json:5 #: digiplan/static/config/traffic_settings_panel.json:11 @@ -243,37 +770,34 @@ msgstr "Zentral: Anteil Großwärmepumpen (%%)" msgid "Share of battery-electric vehicles (%%)" msgstr "Anteil privater batterieelektrischer Fahrzeuge (%%)" -#: digiplan/static/config/traffic_settings_panel.json:17 -#: digiplan/static/config/traffic_settings_panel.json:23 -#, python-format -msgid "Share of plugin-hybrid vehicles (%%)" -msgstr "Anteil privater Plugin-Hybrid-Fahrzeuge (%%)" +#: digiplan/static/config/traffic_settings_panel.json:18 +#| msgid "Share of battery-electric vehicles (%%)" +msgid "Share of battery electric and plugin-hybrid vehicles (%%)" +msgstr "Anteil privater batterieelektrischer Fahrzeuge (%%)" -#: digiplan/static/config/traffic_settings_panel.json:29 -#: digiplan/static/config/traffic_settings_panel.json:35 -#, python-format -msgid "Share of heavy-duty trucks with fuel cell (%%)" -msgstr "Anteil schwerer LKW mit Brennstoffzelle (%%)" +#: digiplan/static/config/traffic_settings_panel.json:24 +msgid "Personal battery electric and plug-in hybrid vehicles" +msgstr "" -#: digiplan/templates/components/map.html:12 +#: digiplan/templates/components/map.html:14 msgid "Region as of today" msgstr "Region heute" -#: digiplan/templates/components/map.html:17 +#: digiplan/templates/components/map.html:19 #: digiplan/templates/components/panel_2_settings.html:9 msgid "Settings" msgstr "Einstellungen" -#: digiplan/templates/components/map.html:22 +#: digiplan/templates/components/map.html:24 #: digiplan/templates/components/panel_3_results.html:29 msgid "Results" msgstr "Ergebnisse" -#: digiplan/templates/components/map.html:38 digiplan/templates/map.html:49 +#: digiplan/templates/components/map.html:41 digiplan/templates/map.html:49 msgid "Map" msgstr "Karte" -#: digiplan/templates/components/map.html:48 +#: digiplan/templates/components/map.html:51 msgid "Charts" msgstr "Diagramme" @@ -292,12 +816,13 @@ msgstr "Ziele 2045" #: digiplan/templates/components/panel_1_today.html:10 #: digiplan/templates/components/panel_3_results.html:7 msgid "Share of renewable energies" -msgstr "Anteil erneuerbarer Energien" +msgstr "Anteil Erneuerbarer Energien" #: digiplan/templates/components/panel_1_today.html:18 #: digiplan/templates/components/panel_3_results.html:15 -msgid "CO2-Emissions (Mt)" -msgstr "CO2-Emissionen (Mt)" +#, python-format +msgid "CO2-Reduktion ggü. 2019 (%%)" +msgstr "" #: digiplan/templates/components/panel_1_today.html:34 msgid "Situation today" @@ -309,7 +834,7 @@ msgid "Planning Region" msgstr "Planungsregion" #: digiplan/templates/components/panel_1_today.html:39 -#: digiplan/templates/components/panel_1_today.html:97 +#: digiplan/templates/components/panel_1_today.html:101 msgid "Inhabitants 2021" msgstr "Einwohner:innen 2021" @@ -325,12 +850,12 @@ msgstr "" msgid "Population Density" msgstr "Bevölkerungsdichte" -#: digiplan/templates/components/panel_1_today.html:45 +#: digiplan/templates/components/panel_1_today.html:47 #: digiplan/templates/components/panel_3_results.html:40 msgid "Renewable Energies (RE)" msgstr "Erneuerbare Energien" -#: digiplan/templates/components/panel_1_today.html:47 +#: digiplan/templates/components/panel_1_today.html:49 #: digiplan/templates/components/panel_3_results.html:42 #, python-format msgid "" @@ -349,12 +874,12 @@ msgstr "" "werden darin nicht berücksichtigt.In Deutschland wurde 2022 ein Strombedarf " "von 49,7%% von Erneuerbaren Energien gedeckt." -#: digiplan/templates/components/panel_1_today.html:48 +#: digiplan/templates/components/panel_1_today.html:50 #: digiplan/templates/components/panel_3_results.html:43 msgid "Renewable Energy Share of Demand" msgstr "Anteil Energie aus EE an Strombedarf" -#: digiplan/templates/components/panel_1_today.html:51 +#: digiplan/templates/components/panel_1_today.html:53 #: digiplan/templates/components/panel_3_results.html:46 msgid "" "Annual amount of energy fed into the grid from renewable plants in gigawatt " @@ -363,12 +888,12 @@ msgstr "" "Jährlich eingespeiste Energiemenge aus erneuerbaren Anlagen in " "Gigawattstunden (Windenergie, Photovoltaik, Wasserkraft)." -#: digiplan/templates/components/panel_1_today.html:52 +#: digiplan/templates/components/panel_1_today.html:54 #: digiplan/templates/components/panel_3_results.html:47 msgid "Renewable Electricity Production (GWh)" msgstr "Gewonnene Energie aus EE (GWh)" -#: digiplan/templates/components/panel_1_today.html:54 +#: digiplan/templates/components/panel_1_today.html:56 #: digiplan/templates/components/panel_3_results.html:49 msgid "" "Annual amount of energy fed in from renewable plants (wind energy, " @@ -379,12 +904,12 @@ msgstr "" "Photovoltaik, Wasserkraft) bezogen auf die Einwohnerzahl in Megawattstunden " "pro EinwohnerIn." -#: digiplan/templates/components/panel_1_today.html:55 +#: digiplan/templates/components/panel_1_today.html:57 #: digiplan/templates/components/panel_3_results.html:50 msgid "Renewable Electricity Production per Capita (MWh)" msgstr "Gewonnene Energie aus EE je EinwohnerIn (MWh)" -#: digiplan/templates/components/panel_1_today.html:58 +#: digiplan/templates/components/panel_1_today.html:60 #: digiplan/templates/components/panel_3_results.html:53 msgid "" "Annual amount of energy fed in from renewable plants (wind energy, " @@ -393,12 +918,12 @@ msgstr "" "Jährlich eingespeiste Energiemenge aus erneuerbaren Anlagen (Windenergie, " "Photovoltaik, Wasserkraft) bezogen auf die Fläche in Megawattstunden pro km²." -#: digiplan/templates/components/panel_1_today.html:59 +#: digiplan/templates/components/panel_1_today.html:61 #: digiplan/templates/components/panel_3_results.html:54 msgid "Renewable Electricity Production per km² (MWh)" msgstr "Gewonnene Energie aus EE je km² (MWh)" -#: digiplan/templates/components/panel_1_today.html:62 +#: digiplan/templates/components/panel_1_today.html:64 #: digiplan/templates/components/panel_3_results.html:57 msgid "" "Installed capacity from renewable energy plants (wind energy, photovoltaic, " @@ -407,12 +932,12 @@ msgstr "" "Installierte Leistung aus erneuerbaren Energieanlagen (Windenergie, " "Photovoltaik, Wasserkraft, Biomasse und Biogas) in Megawatt ." -#: digiplan/templates/components/panel_1_today.html:63 +#: digiplan/templates/components/panel_1_today.html:65 #: digiplan/templates/components/panel_3_results.html:58 msgid "Installed Renewable Capacity (MW)" msgstr "Installierte Leistung EE (MW)" -#: digiplan/templates/components/panel_1_today.html:66 +#: digiplan/templates/components/panel_1_today.html:68 #: digiplan/templates/components/panel_3_results.html:61 msgid "" "Installed capacity from renewable energy plants (wind energy, photovoltaic, " @@ -421,33 +946,32 @@ msgstr "" "Installierte Leistung aus erneuerbaren Energieanlagen (Windenergie, " "Photovoltaik, Wasserkraft, Biomasse und Biogas) in Megawatt pro km² ." -#: digiplan/templates/components/panel_1_today.html:67 +#: digiplan/templates/components/panel_1_today.html:69 #: digiplan/templates/components/panel_3_results.html:62 msgid "Installed Renewable Capacity per km² (MW)" msgstr "Installierte Leistung EE je km² (MW)" -#: digiplan/templates/components/panel_1_today.html:70 -#: digiplan/templates/components/panel_1_today.html:71 +#: digiplan/templates/components/panel_1_today.html:72 +#: digiplan/templates/components/panel_1_today.html:73 #: digiplan/templates/components/panel_3_results.html:65 #: digiplan/templates/components/panel_3_results.html:66 -#, fuzzy #| msgid "Number of Wind Turbines per km²" msgid "Number of Wind Turbines" msgstr "Anzahl Windenergieanlagen je km²" -#: digiplan/templates/components/panel_1_today.html:74 -#: digiplan/templates/components/panel_1_today.html:75 +#: digiplan/templates/components/panel_1_today.html:76 +#: digiplan/templates/components/panel_1_today.html:77 #: digiplan/templates/components/panel_3_results.html:69 #: digiplan/templates/components/panel_3_results.html:70 msgid "Number of Wind Turbines per km²" msgstr "Anzahl Windenergieanlagen je km²" -#: digiplan/templates/components/panel_1_today.html:78 +#: digiplan/templates/components/panel_1_today.html:80 #: digiplan/templates/components/panel_3_results.html:73 msgid "Energy Demand" msgstr "Strombedarf" -#: digiplan/templates/components/panel_1_today.html:80 +#: digiplan/templates/components/panel_1_today.html:82 #: digiplan/templates/components/panel_3_results.html:75 msgid "" "Annual electricity demand in gigawatt hours of the sectors, households, " @@ -458,12 +982,12 @@ msgstr "" "(Gewerbe, Handel Dienstleistungen), Landwirtschaft und Industrie. Es handelt " "sich dabei um den Nettostromverbrauch." -#: digiplan/templates/components/panel_1_today.html:81 +#: digiplan/templates/components/panel_1_today.html:83 #: digiplan/templates/components/panel_3_results.html:76 msgid "Electricity Demand (GWh)" msgstr "Strombedarf (GWh)" -#: digiplan/templates/components/panel_1_today.html:84 +#: digiplan/templates/components/panel_1_today.html:86 #: digiplan/templates/components/panel_3_results.html:79 msgid "" "Annual electricity demand in gigawatt hours of the sectors, households, " @@ -474,14 +998,13 @@ msgstr "" "(Gewerbe, Handel Dienstleistungen), Landwirtschaft und Industrie je " "EinwohnerIn. Es handelt sich dabei um den Nettostromverbrauch." -#: digiplan/templates/components/panel_1_today.html:85 +#: digiplan/templates/components/panel_1_today.html:87 #: digiplan/templates/components/panel_3_results.html:80 -#, fuzzy #| msgid "Electricity Demand" msgid "Electricity Demand per Capita (kWh)" msgstr "Strombedarf je EinwohnerIn (kWh)" -#: digiplan/templates/components/panel_1_today.html:88 +#: digiplan/templates/components/panel_1_today.html:90 #: digiplan/templates/components/panel_3_results.html:83 msgid "" "Annual heat consumption for space heating and domestic hot water in gigawatt " @@ -492,12 +1015,12 @@ msgstr "" "Gigawattstunden der Sektoren Haushalte, GHD (Gewerbe, Handel, " "Dienstleistungen), Landwirtschaft (ohne Industrie)." -#: digiplan/templates/components/panel_1_today.html:89 +#: digiplan/templates/components/panel_1_today.html:91 #: digiplan/templates/components/panel_3_results.html:84 msgid "Heat Demand (GWh)" msgstr "Wärmebedarf (GWh)" -#: digiplan/templates/components/panel_1_today.html:92 +#: digiplan/templates/components/panel_1_today.html:94 #: digiplan/templates/components/panel_3_results.html:87 msgid "" "Annual heat consumption per inhabitant for space heating and domestic hot " @@ -508,24 +1031,25 @@ msgstr "" "Trinkwassererwärmung in Gigawattstunden der Sektoren Haushalte, GHD " "(Gewerbe, Handel, Dienstleistungen), Landwirtschaft (ohne Industrie)." -#: digiplan/templates/components/panel_1_today.html:93 +#: digiplan/templates/components/panel_1_today.html:95 #: digiplan/templates/components/panel_3_results.html:88 msgid "Heat Demand per Capita (kWh)" msgstr "Wärmebedarf je EinwohnerIn (kWh)" #: digiplan/templates/components/panel_2_settings.html:18 -#: digiplan/templates/components/panel_3_results.html:111 +#: digiplan/templates/components/panel_3_results.html:116 +#: digiplan/templates/components/results_view.html:35 msgid "Electricity" msgstr "Strom" #: digiplan/templates/components/panel_2_settings.html:26 -#: digiplan/templates/components/panel_3_results.html:119 -#: digiplan/templates/components/results_view.html:52 +#: digiplan/templates/components/panel_3_results.html:124 +#: digiplan/templates/components/results_view.html:56 msgid "Heat" msgstr "Wärme" #: digiplan/templates/components/panel_2_settings.html:34 -#: digiplan/templates/components/panel_3_results.html:127 +#: digiplan/templates/components/panel_3_results.html:132 msgid "Transportation" msgstr "Verkehr" @@ -534,23 +1058,24 @@ msgstr "Verkehr" msgid "Inhabitants" msgstr "" -#: digiplan/templates/components/panel_3_results.html:95 +#: digiplan/templates/components/panel_3_results.html:100 msgid "View" msgstr "Ansicht" -#: digiplan/templates/components/panel_3_results.html:103 -#: digiplan/templates/components/results_view.html:5 -#: digiplan/templates/components/results_view.html:35 -#: digiplan/templates/components/results_view.html:55 -msgid "General" -msgstr "Allgemein" - +#: digiplan/templates/components/panel_3_results.html:108 #: digiplan/templates/components/results_view.html:9 #: digiplan/templates/components/results_view.html:39 -#: digiplan/templates/components/results_view.html:59 msgid "Overview" msgstr "Überblick" +#: digiplan/templates/components/panel_3_results.html:146 +msgid "CO2-Emissionen" +msgstr "" + +#: digiplan/templates/components/results_view.html:5 +msgid "General" +msgstr "Allgemein" + #: digiplan/templates/components/results_view.html:12 msgid "" "In dieser Darstellung sind die Ergebnisse der beiden Szenarien für die " @@ -566,38 +1091,302 @@ msgstr "Treibhausgas" #: digiplan/templates/components/results_view.html:22 msgid "Car trip" -msgstr "Autofahrt" +msgstr "" + +#: digiplan/templates/components/results_view.html:42 +#: digiplan/templates/components/results_view.html:49 +#: digiplan/templates/components/results_view.html:63 +#: digiplan/templates/components/results_view.html:70 +#: digiplan/templates/components/results_view.html:121 +msgid "Hier folgt ein Beschreibungstext..." +msgstr "" -#: digiplan/templates/components/results_view.html:44 -#: digiplan/templates/components/results_view.html:64 +#: digiplan/templates/components/results_view.html:46 +#: digiplan/templates/components/results_view.html:88 msgid "CO2 Emissions" msgstr "CO2 Emissionen" +#: digiplan/templates/components/results_view.html:60 +msgid "Endenergiebedarf" +msgstr "" + +#: digiplan/templates/components/results_view.html:67 +msgid "Beheizungsstruktur" +msgstr "" + +#: digiplan/templates/components/results_view.html:77 +msgid "Motorized individual traffic" +msgstr "Motorisierter Individualverkehr" + +#: digiplan/templates/components/results_view.html:81 +msgid "Vehicles" +msgstr "Fahrzeuge" + +#: digiplan/templates/components/results_view.html:84 +msgid "Zugelassene Fahrzeuge nach Antriebsart." +msgstr "" + +#: digiplan/templates/components/results_view.html:94 +msgid "Distance" +msgstr "Autofahrt" + +#: digiplan/templates/components/results_view.html:107 +msgid "Abschätzung CO2-Emissionen" +msgstr "" + +#: digiplan/templates/components/results_view.html:111 +msgid "Sachsen-Anhalt und Abschätzung Region ABW" +msgstr "" + +#: digiplan/templates/components/results_view.html:114 +msgid "" +"Die THG-Emissionen für die Region ABW werden näherungsweise anhand " +"unterschiedlicher Kriterien und Datenquellen aus den Gesamtemissionen für " +"Sachsen-Anhalt (The goals for Saxony-Anhalt from the Wind Energy Area " +"Requirement Act are:
- for 2027 (1.4%%) achieved.
- for 2032 (2.2%%) " +"achieved.

Tip: In the menu on the right you can display the systems " +"that exist today." +msgstr "" +"Mit Ihren Einstellungen kann eine maximale Gesamtleistung von 13 MW und ein " +"Ertrag von 7 GWh realisiert werden.
Die Ziele für Sachsen-Anhalt aus dem " +"Windenergieflächenbedarfsgesetz werden:
- für 2027 (1,4 %%) erreicht.
- " +"für 2032 (2,2 %%) erreicht.

Tipp: Im rechten Menü können Sie die heute " +"bestehenden Anlagen einblenden." + +#: digiplan/templates/forms/panel_energy.html:54 +msgid "Set the use of potential areas for ground-mounted PV." +msgstr "Stellen Sie die Nutzung von Potenzialgebieten für Freiflächen-PV ein" + +#: digiplan/templates/forms/panel_energy.html:67 +#| msgid "" +#| "With your settings, a maximum total output of 13 MW and a yield of 7 GWh " +#| "can be realized.
The goals for Saxony-Anhalt from the Wind Energy Area " +#| "Requirement Act are:
- for 2027 (1.4%%) achieved.
- for 2032 (2.2%" +#| "%) achieved.

Tip: In the menu on the right you can display the " +#| "systems that exist today." +msgid "" +"With your settings, a maximum total output of 18 MW and a yield of 3 GWh can " +"be realized.

Tip: In the right-hand menu, you can display the systems " +"that currently exist." +msgstr "" +"Mit Ihren Einstellungen kann eine maximale Gesamtleistung von 13 MW und ein " +"Ertrag von 7 GWh realisiert werden.
Die Ziele für Sachsen-Anhalt aus dem " +"Windenergieflächenbedarfsgesetz werden:
- für 2027 (1,4 %) erreicht.
- " +"für 2032 (2,2 %) erreicht.

Tipp: Im rechten Menü können Sie die heute " +"bestehenden Anlagen einblenden." + +#: digiplan/templates/forms/panel_energy.html:79 +msgid "Set how much roof area should be used for photovoltaics." +msgstr "" +"Stellen Sie ein, wieviel Dachfläche für Photovoltaik genutzt werden soll." + +#: digiplan/templates/forms/panel_energy.html:92 +#| msgid "" +#| "With your settings, a maximum total output of 13 MW and a yield of 7 GWh " +#| "can be realized.
The goals for Saxony-Anhalt from the Wind Energy Area " +#| "Requirement Act are:
- for 2027 (1.4%%) achieved.
- for 2032 " +#| "(2.2%%) achieved.

Tip: In the menu on the right you can display " +#| "the systems that exist today." +msgid "" +"With your settings, a maximum total output of 4 MW and a yield of 2 GWh can " +"be realized. The distribution of the orientation is as follows:
- South " +"roofs: 3%%
- West roofs: 3%%
- North roofs: 3%%
- East roofs: " +"8%%
Buildings under monument protection are not used.

Tip: In the " +"menu on the right you can show the systems that exist today." +msgstr "" +"Mit Ihren Einstellungen kann eine maximale Gesamtleistung von 13 MW und ein " +"Ertrag von 7 GWh realisiert werden.
Die Ziele für Sachsen-Anhalt aus dem " +"Windenergieflächenbedarfsgesetz werden:
- für 2027 (1,4 %) erreicht.
- " +"für 2032 (2,2 %) erreicht.

Tipp: Im rechten Menü können Sie die heute " +"bestehenden Anlagen einblenden." + +#: digiplan/templates/forms/panel_energy.html:100 +#: digiplan/templates/forms/panel_heat.html:29 msgid "Consumption" -msgstr "Verbraucher" +msgstr "Verbrauch" + +#: digiplan/templates/forms/panel_energy.html:106 +msgid "Set the future power consumption per sector." +msgstr "Stellen Sie den zukünftigen Stromverbrauch je Sektor ein." -#: digiplan/templates/forms/panel_energy.html:56 +#: digiplan/templates/forms/panel_energy.html:110 +#| msgid "" +#| "With your settings, the power consumption is 42%% of today's power " +#| "consumption." +msgid "" +"With your settings, the power consumption is 42 %% of today's power " +"consumption." +msgstr "" +"Mit Ihren Einstellungen beträgt der Stromverbrauch 42 %% des heutigen " +"Stromverbrauchs." + +#: digiplan/templates/forms/panel_energy.html:116 msgid "Batteries" msgstr "Batterien" +#: digiplan/templates/forms/panel_energy.html:122 +msgid "" +"Set how much of the daily (on average) fed-in energy from wind energy and " +"free-field PV should be able to be temporarily stored using large batteries." +msgstr "" +"Stellen Sie ein, wieviel der täglich (im Mittel) eingespeisten Energiemenge " +"aus Windenergie und Freiflächen-PV mit Hilfe von Großbatterien " +"zwischengespeichert werden können sollen." + +#: digiplan/templates/forms/panel_energy.html:124 +#, python-format +msgid "" +"With your settings, 73%% can be cached. That corresponds to a storage " +"capacity of 17 GWh." +msgstr "" +"Mit Ihren Einstellungen können 73%% zwischengespeichert werden. Das " +"entspricht einer Speicherkapazität von 17 GWh." + +#: digiplan/templates/forms/panel_heat.html:8 +msgid "" +"Set the share of heat pumps for consumers with their own heat generation per " +"sector." +msgstr "" +"Stellen Sie den Anteil von Wärmepumpen für Verbraucher mit eigener " +"Wärmeerzeugung je Sektor ein." + +#: digiplan/templates/forms/panel_heat.html:12 +#, python-format +msgid "" +"With your settings, the proportion of energy provided by heat pumps is 87%%. " +"The remaining energy is provided by:
- Direct electric heating: 10%%
- " +"Bioenergy: 5%%
- Solar thermal: 20%%

Note: District heating " +"systems are configured separately in the menu on the left." +msgstr "" +"Mit Ihren Einstellungen beträgt der Anteil der mittels Wärmepumpen " +"bereitgestellten Energiemenge 87 %%. Die übrige Energie wird bereitgestellt " +"durch:
- Direktelektrische Heizung: 10 %%
- Bioenergie: 5 %%
- " +"Solarthermie: 20 %%

Hinweis: Fernwärmesysteme werden links im Menü " +"separat konfiguriert." + +#: digiplan/templates/forms/panel_heat.html:21 +msgid "" +"Set the share of heat pumps for all consumers with district heating " +"connection. This includes households, tertiary and industrial customers in " +"the Dessau-Roßlau, Bitterfeld-Wolfen, Köthen and Wittenberg district heating " +"networks." +msgstr "" +"Stellen Sie den Anteil von Wärmepumpen für alle Verbraucher mit " +"Fernwärmeanschluss ein. Dies umfasst Haushalte, GHD und Industriekunden in " +"den Fernwärmenetzen Dessau-Roßlau, Bitterfeld-Wolfen, Köthen und Wittenberg." + +#: digiplan/templates/forms/panel_heat.html:23 +#, python-format +msgid "" +"With your settings, the proportion of energy provided by heat pumps is 54%%. " +"The remaining energy is provided by:
- Direct electric heating: 12%%
- " +"Bioenergy: 6%%
- Solar thermal: 52%%

Note: Decentralized " +"consumers are configured separately in the menu on the left." +msgstr "" +"Mit Ihren Einstellungen beträgt der Anteil der mittels Wärmepumpen " +"bereitgestellten Energiemenge 54 %%. Die übrige Energie wird bereitgestellt " +"durch:
- Direktelektrische Heizung: 12 %%
- Bioenergie: 6 %%
- " +"Solarthermie: 52 %%

Hinweis: Fernwärmesysteme werden links im Menü " +"separat konfiguriert." + +#: digiplan/templates/forms/panel_heat.html:36 +msgid "Set the future heat consumption per sector." +msgstr "Stellen Sie den zukünftigen Wärmeverbrauch je Sektor ein." + +#: digiplan/templates/forms/panel_heat.html:40 +#| msgid "" +#| "With your settings, the power consumption is 42%% of today's power " +#| "consumption." +msgid "" +"With your settings, the heat consumption is 27%% of today's heat consumption." +msgstr "" +"Mit Ihren Einstellungen beträgt der Stromverbrauch 42 % des heutigen " +"Stromverbrauchs." + +#: digiplan/templates/forms/panel_heat.html:53 +#: digiplan/templates/forms/panel_heat.html:64 +msgid "" +"Set how much of the daily heat requirement should be able to be temporarily " +"stored in hot water tanks." +msgstr "" +"Stellen Sie ein, wieviel des täglichen Wärmebedarfs in Warmwasserspeichern " +"zwischengespeichert werden können sollen." + +#: digiplan/templates/forms/panel_heat.html:55 +#| msgid "" +#| "With your settings, 73%% can be cached. That corresponds to a storage " +#| "capacity of 17 GWh." +msgid "" +"With your settings, 32%% of the daily heat consumption can be temporarily " +"stored. That corresponds to a storage capacity of 3 GWh" +msgstr "" +"Mit Ihren Einstellungen können 73% zwischengespeichert werden. Das " +"entspricht einer Speicherkapazität von 17 GWh." + +#: digiplan/templates/forms/panel_heat.html:66 +#| msgid "" +#| "With your settings, 73%% can be cached. That corresponds to a storage " +#| "capacity of 17 GWh." +msgid "" +"With your settings, 57%% of the daily heat consumption can be temporarily " +"stored. That corresponds to a storage capacity of 5 GWh" +msgstr "" +"Mit Ihren Einstellungen können 73% zwischengespeichert werden. Das " +"entspricht einer Speicherkapazität von 17 GWh." + +#: digiplan/templates/forms/panel_traffic.html:8 +msgid "Set the share of electric vehicles in motorized private transport." +msgstr "" + +#: digiplan/templates/forms/panel_traffic.html:10 +#| msgid "" +#| "With your settings, 22%% of private vehicles (compact, mid-size, full-" +#| "size) are electric. Of these,
- %% are battery electric (BEV) and
- " +#| "4%% are plug-in hybrid vehicles." +msgid "" +"With your settings, 22%% of private vehicles (compact, mid-size, full-size) " +"are electric. Of these,
- 50%% are battery electric (BEV) and
- 50%% " +"are plug-in hybrid vehicles." +msgstr "" +"Mit Ihren Einstellungen sind 22 % der privaten Fahrzeuge (Kleinwagen, " +"Mittelklasse, Oberklasse) elektrisch. Davon sind
- 50 % " +"batterieelektrisch (BEV) und
- 50 % Plugin-Hybrid-Fahrzeuge." + #: digiplan/templates/map.html:54 msgid "Documentation" msgstr "Dokumentation" @@ -626,6 +1415,59 @@ msgstr "Telefon" msgid "Telefax" msgstr "Telefax" +#: digiplan/templates/popups/cluster.html:10 +msgid "Parameter" +msgstr "" + +#: digiplan/templates/popups/cluster.html:11 +msgid "Wert" +msgstr "" + #: digiplan/templates/widgets/slider.html:18 msgid "more" msgstr "mehr" + +#~ msgid "CO2-Emissions (Mt)" +#~ msgstr "CO2-Emissionen (Mt)" + +#, fuzzy +#~| msgid "CO2 Emissions" +#~ msgid "Emissions" +#~ msgstr "Emissionen" + +#~ msgid "Total Costs" +#~ msgstr "Gesamtkosten" + +#, fuzzy +#~| msgid "Distance from residential areas" +#~ msgid "Distance from residential areas (m)" +#~ msgstr "Siedlungsabstand" + +#~ msgid "Remove restrictions on disadvantaged areas." +#~ msgstr "Begrenzung auf benachteiligte Gebiete aufheben" + +#~ msgid "Bioenergy (MW)" +#~ msgstr "Bioenergie (MW)" + +#~ msgid "Conventional Energy (MW)" +#~ msgstr "Konventionell (MW)" + +#, python-format +#~ msgid "Decentralized: share of households with heat pumps (%%)" +#~ msgstr "Dezentral: Anteil Haushalte mit Wärmepumpe (%%)" + +#, python-format +#~ msgid "Decentralized: share of households with solar thermal energy (%%)" +#~ msgstr "Dezentral, Anteil Haushalte mit Solartherme (%%)" + +#, python-format +#~ msgid "Centralized: Share of large scale heat pumps (%%)" +#~ msgstr "Zentral: Anteil Großwärmepumpen (%%)" + +#, python-format +#~ msgid "Share of plugin-hybrid vehicles (%%)" +#~ msgstr "Anteil privater Plugin-Hybrid-Fahrzeuge (%%)" + +#, python-format +#~ msgid "Share of heavy-duty trucks with fuel cell (%%)" +#~ msgstr "Anteil schwerer LKW mit Brennstoffzelle (%%)" diff --git a/manage.py b/manage.py index 7ac5bb8a..41b3b97e 100755 --- a/manage.py +++ b/manage.py @@ -14,10 +14,12 @@ try: import django # noqa except ImportError: + msg = ( + "Couldn't import Django. Are you sure it's installed and available on your " + "PYTHONPATH environment variable? Did you forget to activate a virtual environment?" + ) raise ImportError( - "Couldn't import Django. Are you sure it's installed and " - "available on your PYTHONPATH environment variable? Did you " - "forget to activate a virtual environment?" + msg, ) raise diff --git a/merge_local_dotenvs_in_dotenv.py b/merge_local_dotenvs_in_dotenv.py index 01c1acc1..7f620d97 100755 --- a/merge_local_dotenvs_in_dotenv.py +++ b/merge_local_dotenvs_in_dotenv.py @@ -1,5 +1,7 @@ +"""This module helps to load local dotenvs from .envs fodler into .envs file""" + import os -from typing import Sequence +from collections.abc import Sequence ROOT_DIR_PATH = os.path.dirname(os.path.realpath(__file__)) LOCAL_DOTENVS_DIR_PATH = os.path.join(ROOT_DIR_PATH, ".envs", ".local") @@ -13,7 +15,7 @@ def merge(output_file_path: str, merged_file_paths: Sequence[str], append_linesep: bool = True) -> None: with open(output_file_path, "w", encoding="utf8") as output_file: for merged_file_path in merged_file_paths: - with open(merged_file_path, "r", encoding="utf8") as merged_file: + with open(merged_file_path, encoding="utf8") as merged_file: merged_file_content = merged_file.read() output_file.write(merged_file_content) if append_linesep: diff --git a/poetry.lock b/poetry.lock index 06e21c2d..8fd06428 100644 --- a/poetry.lock +++ b/poetry.lock @@ -95,13 +95,13 @@ tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"] [[package]] name = "astroid" -version = "2.15.5" +version = "2.15.6" description = "An abstract syntax tree for Python with inference support." optional = false python-versions = ">=3.7.2" files = [ - {file = "astroid-2.15.5-py3-none-any.whl", hash = "sha256:078e5212f9885fa85fbb0cf0101978a336190aadea6e13305409d099f71b2324"}, - {file = "astroid-2.15.5.tar.gz", hash = "sha256:1039262575027b441137ab4a62a793a9b43defb42c32d5670f38686207cd780f"}, + {file = "astroid-2.15.6-py3-none-any.whl", hash = "sha256:389656ca57b6108f939cf5d2f9a2a825a3be50ba9d589670f393236e0a03b91c"}, + {file = "astroid-2.15.6.tar.gz", hash = "sha256:903f024859b7c7687d7a7f3a3f73b17301f8e42dfd9cc9df9d4418172d3e2dbd"}, ] [package.dependencies] @@ -180,29 +180,6 @@ files = [ {file = "backcall-0.2.0.tar.gz", hash = "sha256:5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e"}, ] -[[package]] -name = "bandit" -version = "1.7.5" -description = "Security oriented static analyser for python code." -optional = false -python-versions = ">=3.7" -files = [ - {file = "bandit-1.7.5-py3-none-any.whl", hash = "sha256:75665181dc1e0096369112541a056c59d1c5f66f9bb74a8d686c3c362b83f549"}, - {file = "bandit-1.7.5.tar.gz", hash = "sha256:bdfc739baa03b880c2d15d0431b31c658ffc348e907fe197e54e0389dd59e11e"}, -] - -[package.dependencies] -colorama = {version = ">=0.3.9", markers = "platform_system == \"Windows\""} -GitPython = ">=1.0.1" -PyYAML = ">=5.3.1" -rich = "*" -stevedore = ">=1.20.0" - -[package.extras] -test = ["beautifulsoup4 (>=4.8.0)", "coverage (>=4.5.4)", "fixtures (>=3.0.0)", "flake8 (>=4.0.0)", "pylint (==1.9.4)", "stestr (>=2.5.0)", "testscenarios (>=0.5.0)", "testtools (>=2.3.0)", "tomli (>=1.1.0)"] -toml = ["tomli (>=1.1.0)"] -yaml = ["PyYAML"] - [[package]] name = "bcrypt" version = "4.0.1" @@ -327,13 +304,13 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.29.156" +version = "1.29.165" description = "Low-level, data-driven core of boto 3." optional = false python-versions = ">= 3.7" files = [ - {file = "botocore-1.29.156-py3-none-any.whl", hash = "sha256:44b26a5468402bb9e5028d8f9ef2eba973cde016979aa72f87db32ef9000dab4"}, - {file = "botocore-1.29.156.tar.gz", hash = "sha256:21d0c2cb1461f2676e41a896e6e551c7da09e923f416322182520851b179ebda"}, + {file = "botocore-1.29.165-py3-none-any.whl", hash = "sha256:6f35d59e230095aed7cd747604fe248fa384bebb7d09549077892f936a8ca3df"}, + {file = "botocore-1.29.165.tar.gz", hash = "sha256:988b948be685006b43c4bbd8f5c0cb93e77c66deb70561994e0c5b31b5a67210"}, ] [package.dependencies] @@ -548,86 +525,86 @@ files = [ [[package]] name = "charset-normalizer" -version = "3.1.0" +version = "3.2.0" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." optional = false python-versions = ">=3.7.0" files = [ - {file = "charset-normalizer-3.1.0.tar.gz", hash = "sha256:34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e0ac8959c929593fee38da1c2b64ee9778733cdf03c482c9ff1d508b6b593b2b"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d7fc3fca01da18fbabe4625d64bb612b533533ed10045a2ac3dd194bfa656b60"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:04eefcee095f58eaabe6dc3cc2262f3bcd776d2c67005880894f447b3f2cb9c1"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20064ead0717cf9a73a6d1e779b23d149b53daf971169289ed2ed43a71e8d3b0"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1435ae15108b1cb6fffbcea2af3d468683b7afed0169ad718451f8db5d1aff6f"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c84132a54c750fda57729d1e2599bb598f5fa0344085dbde5003ba429a4798c0"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75f2568b4189dda1c567339b48cba4ac7384accb9c2a7ed655cd86b04055c795"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:11d3bcb7be35e7b1bba2c23beedac81ee893ac9871d0ba79effc7fc01167db6c"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:891cf9b48776b5c61c700b55a598621fdb7b1e301a550365571e9624f270c203"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5f008525e02908b20e04707a4f704cd286d94718f48bb33edddc7d7b584dddc1"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:b06f0d3bf045158d2fb8837c5785fe9ff9b8c93358be64461a1089f5da983137"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:49919f8400b5e49e961f320c735388ee686a62327e773fa5b3ce6721f7e785ce"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:22908891a380d50738e1f978667536f6c6b526a2064156203d418f4856d6e86a"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-win32.whl", hash = "sha256:12d1a39aa6b8c6f6248bb54550efcc1c38ce0d8096a146638fd4738e42284448"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:65ed923f84a6844de5fd29726b888e58c62820e0769b76565480e1fdc3d062f8"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9a3267620866c9d17b959a84dd0bd2d45719b817245e49371ead79ed4f710d19"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6734e606355834f13445b6adc38b53c0fd45f1a56a9ba06c2058f86893ae8017"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aaf53a6cebad0eae578f062c7d462155eada9c172bd8c4d250b8c1d8eb7f916a"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3dc5b6a8ecfdc5748a7e429782598e4f17ef378e3e272eeb1340ea57c9109f41"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e1b25e3ad6c909f398df8921780d6a3d120d8c09466720226fc621605b6f92b1"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ca564606d2caafb0abe6d1b5311c2649e8071eb241b2d64e75a0d0065107e62"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b82fab78e0b1329e183a65260581de4375f619167478dddab510c6c6fb04d9b6"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bd7163182133c0c7701b25e604cf1611c0d87712e56e88e7ee5d72deab3e76b5"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:11d117e6c63e8f495412d37e7dc2e2fff09c34b2d09dbe2bee3c6229577818be"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:cf6511efa4801b9b38dc5546d7547d5b5c6ef4b081c60b23e4d941d0eba9cbeb"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:abc1185d79f47c0a7aaf7e2412a0eb2c03b724581139193d2d82b3ad8cbb00ac"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cb7b2ab0188829593b9de646545175547a70d9a6e2b63bf2cd87a0a391599324"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-win32.whl", hash = "sha256:c36bcbc0d5174a80d6cccf43a0ecaca44e81d25be4b7f90f0ed7bcfbb5a00909"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:cca4def576f47a09a943666b8f829606bcb17e2bc2d5911a46c8f8da45f56755"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0c95f12b74681e9ae127728f7e5409cbbef9cd914d5896ef238cc779b8152373"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ac0aa6cd53ab9a31d397f8303f92c42f534693528fafbdb997c82bae6e477ad9"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c3af8e0f07399d3176b179f2e2634c3ce9c1301379a6b8c9c9aeecd481da494f"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a5fc78f9e3f501a1614a98f7c54d3969f3ad9bba8ba3d9b438c3bc5d047dd28"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:628c985afb2c7d27a4800bfb609e03985aaecb42f955049957814e0491d4006d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:74db0052d985cf37fa111828d0dd230776ac99c740e1a758ad99094be4f1803d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:1e8fcdd8f672a1c4fc8d0bd3a2b576b152d2a349782d1eb0f6b8e52e9954731d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:04afa6387e2b282cf78ff3dbce20f0cc071c12dc8f685bd40960cc68644cfea6"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:dd5653e67b149503c68c4018bf07e42eeed6b4e956b24c00ccdf93ac79cdff84"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d2686f91611f9e17f4548dbf050e75b079bbc2a82be565832bc8ea9047b61c8c"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-win32.whl", hash = "sha256:4155b51ae05ed47199dc5b2a4e62abccb274cee6b01da5b895099b61b1982974"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:322102cdf1ab682ecc7d9b1c5eed4ec59657a65e1c146a0da342b78f4112db23"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e633940f28c1e913615fd624fcdd72fdba807bf53ea6925d6a588e84e1151531"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3a06f32c9634a8705f4ca9946d667609f52cf130d5548881401f1eb2c39b1e2c"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7381c66e0561c5757ffe616af869b916c8b4e42b367ab29fedc98481d1e74e14"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3573d376454d956553c356df45bb824262c397c6e26ce43e8203c4c540ee0acb"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e89df2958e5159b811af9ff0f92614dabf4ff617c03a4c1c6ff53bf1c399e0e1"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78cacd03e79d009d95635e7d6ff12c21eb89b894c354bd2b2ed0b4763373693b"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de5695a6f1d8340b12a5d6d4484290ee74d61e467c39ff03b39e30df62cf83a0"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c60b9c202d00052183c9be85e5eaf18a4ada0a47d188a83c8f5c5b23252f649"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f645caaf0008bacf349875a974220f1f1da349c5dbe7c4ec93048cdc785a3326"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ea9f9c6034ea2d93d9147818f17c2a0860d41b71c38b9ce4d55f21b6f9165a11"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:80d1543d58bd3d6c271b66abf454d437a438dff01c3e62fdbcd68f2a11310d4b"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:73dc03a6a7e30b7edc5b01b601e53e7fc924b04e1835e8e407c12c037e81adbd"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6f5c2e7bc8a4bf7c426599765b1bd33217ec84023033672c1e9a8b35eaeaaaf8"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-win32.whl", hash = "sha256:12a2b561af122e3d94cdb97fe6fb2bb2b82cef0cdca131646fdb940a1eda04f0"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:3160a0fd9754aab7d47f95a6b63ab355388d890163eb03b2d2b87ab0a30cfa59"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:38e812a197bf8e71a59fe55b757a84c1f946d0ac114acafaafaf21667a7e169e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6baf0baf0d5d265fa7944feb9f7451cc316bfe30e8df1a61b1bb08577c554f31"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8f25e17ab3039b05f762b0a55ae0b3632b2e073d9c8fc88e89aca31a6198e88f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3747443b6a904001473370d7810aa19c3a180ccd52a7157aacc264a5ac79265e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b116502087ce8a6b7a5f1814568ccbd0e9f6cfd99948aa59b0e241dc57cf739f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d16fd5252f883eb074ca55cb622bc0bee49b979ae4e8639fff6ca3ff44f9f854"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21fa558996782fc226b529fdd2ed7866c2c6ec91cee82735c98a197fae39f706"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6f6c7a8a57e9405cad7485f4c9d3172ae486cfef1344b5ddd8e5239582d7355e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ac3775e3311661d4adace3697a52ac0bab17edd166087d493b52d4f4f553f9f0"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:10c93628d7497c81686e8e5e557aafa78f230cd9e77dd0c40032ef90c18f2230"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:6f4f4668e1831850ebcc2fd0b1cd11721947b6dc7c00bf1c6bd3c929ae14f2c7"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0be65ccf618c1e7ac9b849c315cc2e8a8751d9cfdaa43027d4f6624bd587ab7e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:53d0a3fa5f8af98a1e261de6a3943ca631c526635eb5817a87a59d9a57ebf48f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-win32.whl", hash = "sha256:a04f86f41a8916fe45ac5024ec477f41f886b3c435da2d4e3d2709b22ab02af1"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:830d2948a5ec37c386d3170c483063798d7879037492540f10a475e3fd6f244b"}, - {file = "charset_normalizer-3.1.0-py3-none-any.whl", hash = "sha256:3d9098b479e78c85080c98e1e35ff40b4a31d8953102bb0fd7d1b6f8a2111a3d"}, + {file = "charset-normalizer-3.2.0.tar.gz", hash = "sha256:3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0b87549028f680ca955556e3bd57013ab47474c3124dc069faa0b6545b6c9710"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7c70087bfee18a42b4040bb9ec1ca15a08242cf5867c58726530bdf3945672ed"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a103b3a7069b62f5d4890ae1b8f0597618f628b286b03d4bc9195230b154bfa9"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:94aea8eff76ee6d1cdacb07dd2123a68283cb5569e0250feab1240058f53b623"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:db901e2ac34c931d73054d9797383d0f8009991e723dab15109740a63e7f902a"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b0dac0ff919ba34d4df1b6131f59ce95b08b9065233446be7e459f95554c0dc8"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:193cbc708ea3aca45e7221ae58f0fd63f933753a9bfb498a3b474878f12caaad"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09393e1b2a9461950b1c9a45d5fd251dc7c6f228acab64da1c9c0165d9c7765c"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:baacc6aee0b2ef6f3d308e197b5d7a81c0e70b06beae1f1fcacffdbd124fe0e3"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:bf420121d4c8dce6b889f0e8e4ec0ca34b7f40186203f06a946fa0276ba54029"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:c04a46716adde8d927adb9457bbe39cf473e1e2c2f5d0a16ceb837e5d841ad4f"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:aaf63899c94de41fe3cf934601b0f7ccb6b428c6e4eeb80da72c58eab077b19a"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d62e51710986674142526ab9f78663ca2b0726066ae26b78b22e0f5e571238dd"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-win32.whl", hash = "sha256:04e57ab9fbf9607b77f7d057974694b4f6b142da9ed4a199859d9d4d5c63fe96"}, + {file = "charset_normalizer-3.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:48021783bdf96e3d6de03a6e39a1171ed5bd7e8bb93fc84cc649d11490f87cea"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:4957669ef390f0e6719db3613ab3a7631e68424604a7b448f079bee145da6e09"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:46fb8c61d794b78ec7134a715a3e564aafc8f6b5e338417cb19fe9f57a5a9bf2"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f25c229a6ba38a35ae6e25ca1264621cc25d4d38dca2942a7fce0b67a4efe918"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2efb1bd13885392adfda4614c33d3b68dee4921fd0ac1d3988f8cbb7d589e72a"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1f30b48dd7fa1474554b0b0f3fdfdd4c13b5c737a3c6284d3cdc424ec0ffff3a"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:246de67b99b6851627d945db38147d1b209a899311b1305dd84916f2b88526c6"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9bd9b3b31adcb054116447ea22caa61a285d92e94d710aa5ec97992ff5eb7cf3"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:8c2f5e83493748286002f9369f3e6607c565a6a90425a3a1fef5ae32a36d749d"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:3170c9399da12c9dc66366e9d14da8bf7147e1e9d9ea566067bbce7bb74bd9c2"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:7a4826ad2bd6b07ca615c74ab91f32f6c96d08f6fcc3902ceeedaec8cdc3bcd6"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:3b1613dd5aee995ec6d4c69f00378bbd07614702a315a2cf6c1d21461fe17c23"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9e608aafdb55eb9f255034709e20d5a83b6d60c054df0802fa9c9883d0a937aa"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-win32.whl", hash = "sha256:f2a1d0fd4242bd8643ce6f98927cf9c04540af6efa92323e9d3124f57727bfc1"}, + {file = "charset_normalizer-3.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:681eb3d7e02e3c3655d1b16059fbfb605ac464c834a0c629048a30fad2b27489"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c57921cda3a80d0f2b8aec7e25c8aa14479ea92b5b51b6876d975d925a2ea346"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41b25eaa7d15909cf3ac4c96088c1f266a9a93ec44f87f1d13d4a0e86c81b982"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f058f6963fd82eb143c692cecdc89e075fa0828db2e5b291070485390b2f1c9c"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a7647ebdfb9682b7bb97e2a5e7cb6ae735b1c25008a70b906aecca294ee96cf4"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eef9df1eefada2c09a5e7a40991b9fc6ac6ef20b1372abd48d2794a316dc0449"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e03b8895a6990c9ab2cdcd0f2fe44088ca1c65ae592b8f795c3294af00a461c3"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ee4006268ed33370957f55bf2e6f4d263eaf4dc3cfc473d1d90baff6ed36ce4a"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c4983bf937209c57240cff65906b18bb35e64ae872da6a0db937d7b4af845dd7"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:3bb7fda7260735efe66d5107fb7e6af6a7c04c7fce9b2514e04b7a74b06bf5dd"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:72814c01533f51d68702802d74f77ea026b5ec52793c791e2da806a3844a46c3"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:70c610f6cbe4b9fce272c407dd9d07e33e6bf7b4aa1b7ffb6f6ded8e634e3592"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-win32.whl", hash = "sha256:a401b4598e5d3f4a9a811f3daf42ee2291790c7f9d74b18d75d6e21dda98a1a1"}, + {file = "charset_normalizer-3.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:c0b21078a4b56965e2b12f247467b234734491897e99c1d51cee628da9786959"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:95eb302ff792e12aba9a8b8f8474ab229a83c103d74a750ec0bd1c1eea32e669"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1a100c6d595a7f316f1b6f01d20815d916e75ff98c27a01ae817439ea7726329"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:6339d047dab2780cc6220f46306628e04d9750f02f983ddb37439ca47ced7149"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4b749b9cc6ee664a3300bb3a273c1ca8068c46be705b6c31cf5d276f8628a94"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a38856a971c602f98472050165cea2cdc97709240373041b69030be15047691f"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89f1b185a01fe560bc8ae5f619e924407efca2191b56ce749ec84982fc59a32a"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e1c8a2f4c69e08e89632defbfabec2feb8a8d99edc9f89ce33c4b9e36ab63037"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2f4ac36d8e2b4cc1aa71df3dd84ff8efbe3bfb97ac41242fbcfc053c67434f46"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a386ebe437176aab38c041de1260cd3ea459c6ce5263594399880bbc398225b2"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:ccd16eb18a849fd8dcb23e23380e2f0a354e8daa0c984b8a732d9cfaba3a776d"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:e6a5bf2cba5ae1bb80b154ed68a3cfa2fa00fde979a7f50d6598d3e17d9ac20c"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:45de3f87179c1823e6d9e32156fb14c1927fcc9aba21433f088fdfb555b77c10"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-win32.whl", hash = "sha256:1000fba1057b92a65daec275aec30586c3de2401ccdcd41f8a5c1e2c87078706"}, + {file = "charset_normalizer-3.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:8b2c760cfc7042b27ebdb4a43a4453bd829a5742503599144d54a032c5dc7e9e"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:855eafa5d5a2034b4621c74925d89c5efef61418570e5ef9b37717d9c796419c"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:203f0c8871d5a7987be20c72442488a0b8cfd0f43b7973771640fc593f56321f"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e857a2232ba53ae940d3456f7533ce6ca98b81917d47adc3c7fd55dad8fab858"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e86d77b090dbddbe78867a0275cb4df08ea195e660f1f7f13435a4649e954e5"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c4fb39a81950ec280984b3a44f5bd12819953dc5fa3a7e6fa7a80db5ee853952"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2dee8e57f052ef5353cf608e0b4c871aee320dd1b87d351c28764fc0ca55f9f4"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8700f06d0ce6f128de3ccdbc1acaea1ee264d2caa9ca05daaf492fde7c2a7200"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1920d4ff15ce893210c1f0c0e9d19bfbecb7983c76b33f046c13a8ffbd570252"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c1c76a1743432b4b60ab3358c937a3fe1341c828ae6194108a94c69028247f22"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f7560358a6811e52e9c4d142d497f1a6e10103d3a6881f18d04dbce3729c0e2c"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:c8063cf17b19661471ecbdb3df1c84f24ad2e389e326ccaf89e3fb2484d8dd7e"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:cd6dbe0238f7743d0efe563ab46294f54f9bc8f4b9bcf57c3c666cc5bc9d1299"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:1249cbbf3d3b04902ff081ffbb33ce3377fa6e4c7356f759f3cd076cc138d020"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-win32.whl", hash = "sha256:6c409c0deba34f147f77efaa67b8e4bb83d2f11c8806405f76397ae5b8c0d1c9"}, + {file = "charset_normalizer-3.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:7095f6fbfaa55defb6b733cfeb14efaae7a29f0b59d8cf213be4e7ca0b857b80"}, + {file = "charset_normalizer-3.2.0-py3-none-any.whl", hash = "sha256:8e098148dd37b4ce3baca71fb394c81dc5d9c7728c95df695d2dca218edf40e6"}, ] [[package]] @@ -839,30 +816,34 @@ test = ["pytest", "pytest-django"] [[package]] name = "cryptography" -version = "41.0.1" +version = "41.0.2" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." optional = false python-versions = ">=3.7" files = [ - {file = "cryptography-41.0.1-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:f73bff05db2a3e5974a6fd248af2566134d8981fd7ab012e5dd4ddb1d9a70699"}, - {file = "cryptography-41.0.1-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:1a5472d40c8f8e91ff7a3d8ac6dfa363d8e3138b961529c996f3e2df0c7a411a"}, - {file = "cryptography-41.0.1-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7fa01527046ca5facdf973eef2535a27fec4cb651e4daec4d043ef63f6ecd4ca"}, - {file = "cryptography-41.0.1-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b46e37db3cc267b4dea1f56da7346c9727e1209aa98487179ee8ebed09d21e43"}, - {file = "cryptography-41.0.1-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:d198820aba55660b4d74f7b5fd1f17db3aa5eb3e6893b0a41b75e84e4f9e0e4b"}, - {file = "cryptography-41.0.1-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:948224d76c4b6457349d47c0c98657557f429b4e93057cf5a2f71d603e2fc3a3"}, - {file = "cryptography-41.0.1-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:059e348f9a3c1950937e1b5d7ba1f8e968508ab181e75fc32b879452f08356db"}, - {file = "cryptography-41.0.1-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:b4ceb5324b998ce2003bc17d519080b4ec8d5b7b70794cbd2836101406a9be31"}, - {file = "cryptography-41.0.1-cp37-abi3-win32.whl", hash = "sha256:8f4ab7021127a9b4323537300a2acfb450124b2def3756f64dc3a3d2160ee4b5"}, - {file = "cryptography-41.0.1-cp37-abi3-win_amd64.whl", hash = "sha256:1fee5aacc7367487b4e22484d3c7e547992ed726d14864ee33c0176ae43b0d7c"}, - {file = "cryptography-41.0.1-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:9a6c7a3c87d595608a39980ebaa04d5a37f94024c9f24eb7d10262b92f739ddb"}, - {file = "cryptography-41.0.1-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:5d092fdfedaec4cbbffbf98cddc915ba145313a6fdaab83c6e67f4e6c218e6f3"}, - {file = "cryptography-41.0.1-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:1a8e6c2de6fbbcc5e14fd27fb24414507cb3333198ea9ab1258d916f00bc3039"}, - {file = "cryptography-41.0.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:cb33ccf15e89f7ed89b235cff9d49e2e62c6c981a6061c9c8bb47ed7951190bc"}, - {file = "cryptography-41.0.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:5f0ff6e18d13a3de56f609dd1fd11470918f770c6bd5d00d632076c727d35485"}, - {file = "cryptography-41.0.1-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:7bfc55a5eae8b86a287747053140ba221afc65eb06207bedf6e019b8934b477c"}, - {file = "cryptography-41.0.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:eb8163f5e549a22888c18b0d53d6bb62a20510060a22fd5a995ec8a05268df8a"}, - {file = "cryptography-41.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:8dde71c4169ec5ccc1087bb7521d54251c016f126f922ab2dfe6649170a3b8c5"}, - {file = "cryptography-41.0.1.tar.gz", hash = "sha256:d34579085401d3f49762d2f7d6634d6b6c2ae1242202e860f4d26b046e3a1006"}, + {file = "cryptography-41.0.2-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:01f1d9e537f9a15b037d5d9ee442b8c22e3ae11ce65ea1f3316a41c78756b711"}, + {file = "cryptography-41.0.2-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:079347de771f9282fbfe0e0236c716686950c19dee1b76240ab09ce1624d76d7"}, + {file = "cryptography-41.0.2-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:439c3cc4c0d42fa999b83ded80a9a1fb54d53c58d6e59234cfe97f241e6c781d"}, + {file = "cryptography-41.0.2-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f14ad275364c8b4e525d018f6716537ae7b6d369c094805cae45300847e0894f"}, + {file = "cryptography-41.0.2-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:84609ade00a6ec59a89729e87a503c6e36af98ddcd566d5f3be52e29ba993182"}, + {file = "cryptography-41.0.2-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:49c3222bb8f8e800aead2e376cbef687bc9e3cb9b58b29a261210456a7783d83"}, + {file = "cryptography-41.0.2-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:d73f419a56d74fef257955f51b18d046f3506270a5fd2ac5febbfa259d6c0fa5"}, + {file = "cryptography-41.0.2-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:2a034bf7d9ca894720f2ec1d8b7b5832d7e363571828037f9e0c4f18c1b58a58"}, + {file = "cryptography-41.0.2-cp37-abi3-win32.whl", hash = "sha256:d124682c7a23c9764e54ca9ab5b308b14b18eba02722b8659fb238546de83a76"}, + {file = "cryptography-41.0.2-cp37-abi3-win_amd64.whl", hash = "sha256:9c3fe6534d59d071ee82081ca3d71eed3210f76ebd0361798c74abc2bcf347d4"}, + {file = "cryptography-41.0.2-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:a719399b99377b218dac6cf547b6ec54e6ef20207b6165126a280b0ce97e0d2a"}, + {file = "cryptography-41.0.2-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:182be4171f9332b6741ee818ec27daff9fb00349f706629f5cbf417bd50e66fd"}, + {file = "cryptography-41.0.2-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:7a9a3bced53b7f09da251685224d6a260c3cb291768f54954e28f03ef14e3766"}, + {file = "cryptography-41.0.2-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:f0dc40e6f7aa37af01aba07277d3d64d5a03dc66d682097541ec4da03cc140ee"}, + {file = "cryptography-41.0.2-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:674b669d5daa64206c38e507808aae49904c988fa0a71c935e7006a3e1e83831"}, + {file = "cryptography-41.0.2-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:7af244b012711a26196450d34f483357e42aeddb04128885d95a69bd8b14b69b"}, + {file = "cryptography-41.0.2-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:9b6d717393dbae53d4e52684ef4f022444fc1cce3c48c38cb74fca29e1f08eaa"}, + {file = "cryptography-41.0.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:192255f539d7a89f2102d07d7375b1e0a81f7478925b3bc2e0549ebf739dae0e"}, + {file = "cryptography-41.0.2-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:f772610fe364372de33d76edcd313636a25684edb94cee53fd790195f5989d14"}, + {file = "cryptography-41.0.2-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:b332cba64d99a70c1e0836902720887fb4529ea49ea7f5462cf6640e095e11d2"}, + {file = "cryptography-41.0.2-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:9a6673c1828db6270b76b22cc696f40cde9043eb90373da5c2f8f2158957f42f"}, + {file = "cryptography-41.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:342f3767e25876751e14f8459ad85e77e660537ca0a066e10e75df9c9e9099f0"}, + {file = "cryptography-41.0.2.tar.gz", hash = "sha256:7d230bf856164de164ecb615ccc14c7fc6de6906ddd5b491f3af90d3514c925c"}, ] [package.dependencies] @@ -974,13 +955,13 @@ files = [ [[package]] name = "django" -version = "3.2.19" +version = "3.2.20" description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design." optional = false python-versions = ">=3.6" files = [ - {file = "Django-3.2.19-py3-none-any.whl", hash = "sha256:21cc991466245d659ab79cb01204f9515690f8dae00e5eabde307f14d24d4d7d"}, - {file = "Django-3.2.19.tar.gz", hash = "sha256:031365bae96814da19c10706218c44dff3b654cc4de20a98bd2d29b9bde469f0"}, + {file = "Django-3.2.20-py3-none-any.whl", hash = "sha256:a477ab326ae7d8807dc25c186b951ab8c7648a3a23f9497763c37307a2b5ef87"}, + {file = "Django-3.2.20.tar.gz", hash = "sha256:dec2a116787b8e14962014bf78e120bba454135108e1af9e9b91ade7b2964c40"}, ] [package.dependencies] @@ -1042,13 +1023,13 @@ six = ">=1.12.0" [[package]] name = "django-coverage-plugin" -version = "3.0.0" +version = "3.1.0" description = "Django template coverage.py plugin" optional = false python-versions = "*" files = [ - {file = "django_coverage_plugin-3.0.0-py3-none-any.whl", hash = "sha256:245ecd6e91e5be7a66e0f811fd57091c46b55c0eb85c7fe1a1e4aebca9842a5f"}, - {file = "django_coverage_plugin-3.0.0.tar.gz", hash = "sha256:c063d8d49ba2da30fe95d91cf3f0f9f659b55c3f80d4a029d619b2b3144b1206"}, + {file = "django_coverage_plugin-3.1.0-py3-none-any.whl", hash = "sha256:eb0ea8ffdb0db11a02994fc99be6500550efb496c350d709f418ff3d8e553a67"}, + {file = "django_coverage_plugin-3.1.0.tar.gz", hash = "sha256:223d34bf92bebadcb8b7b89932480e41c7bd98b44a8156934488fbe7f4a71f99"}, ] [package.dependencies] @@ -1187,7 +1168,7 @@ libsass = ">=0.7.0,<1" [[package]] name = "django-mapengine" -version = "0.11.0" +version = "0.13.1" description = "Map engine for maplibre in django" optional = false python-versions = ">=3.9,<3.12" @@ -1198,6 +1179,7 @@ develop = false colorbrewer = {git = "https://github.com/henhuy/colorbrewer-python.git"} django-appconf = "^1.0.5" django-environ = "^0.10.0" +django-geojson = "^3.1.0" djangorestframework = "^3.14.0" djangorestframework-mvt = "^0.2.5" range-key-dict = "^1.1.0" @@ -1206,11 +1188,11 @@ range-key-dict = "^1.1.0" type = "git" url = "https://github.com/rl-institut/django-mapengine.git" reference = "HEAD" -resolved_reference = "af8854943cd3b452e3705dac6b85c833052337b5" +resolved_reference = "e28699847acb59849ad18cec5105c71bb4f3715a" [[package]] name = "django-oemof" -version = "0.10.0" +version = "0.13.0" description = "Django application to run oemof" optional = false python-versions = "^3.9" @@ -1228,7 +1210,7 @@ djangorestframework = "^3.14.0" type = "git" url = "https://github.com/rl-institut/django-oemof.git" reference = "HEAD" -resolved_reference = "f21d5fa6032117b6cc35db2532666e450168ba58" +resolved_reference = "ef46e36ab9e204abdfa527767d1bc7420f2ea673" [[package]] name = "django-redis" @@ -1305,17 +1287,6 @@ files = [ {file = "docutils-0.19.tar.gz", hash = "sha256:33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6"}, ] -[[package]] -name = "eradicate" -version = "2.3.0" -description = "Removes commented-out code." -optional = false -python-versions = "*" -files = [ - {file = "eradicate-2.3.0-py3-none-any.whl", hash = "sha256:2b29b3dd27171f209e4ddd8204b70c02f0682ae95eecb353f10e8d72b149c63e"}, - {file = "eradicate-2.3.0.tar.gz", hash = "sha256:06df115be3b87d0fc1c483db22a2ebb12bcf40585722810d809cc770f5031c37"}, -] - [[package]] name = "et-xmlfile" version = "1.1.0" @@ -1329,13 +1300,13 @@ files = [ [[package]] name = "exceptiongroup" -version = "1.1.1" +version = "1.1.2" description = "Backport of PEP 654 (exception groups)" optional = false python-versions = ">=3.7" files = [ - {file = "exceptiongroup-1.1.1-py3-none-any.whl", hash = "sha256:232c37c63e4f682982c8b6459f33a8981039e5fb8756b2074364e5055c498c9e"}, - {file = "exceptiongroup-1.1.1.tar.gz", hash = "sha256:d484c3090ba2889ae2928419117447a14daf3c1231d5e30d0aae34f354f01785"}, + {file = "exceptiongroup-1.1.2-py3-none-any.whl", hash = "sha256:e346e69d186172ca7cf029c8c1d16235aa0e04035e5750b4b95039e65204328f"}, + {file = "exceptiongroup-1.1.2.tar.gz", hash = "sha256:12c3e887d6485d16943a309616de20ae5582633e0a2eda17f4e10fd61c1e8af5"}, ] [package.extras] @@ -1372,158 +1343,19 @@ testing = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "diff-cover (>=7.5)", "p [[package]] name = "flake8" -version = "3.9.2" +version = "5.0.4" description = "the modular source code checker: pep8 pyflakes and co" optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" -files = [ - {file = "flake8-3.9.2-py2.py3-none-any.whl", hash = "sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907"}, - {file = "flake8-3.9.2.tar.gz", hash = "sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b"}, -] - -[package.dependencies] -mccabe = ">=0.6.0,<0.7.0" -pycodestyle = ">=2.7.0,<2.8.0" -pyflakes = ">=2.3.0,<2.4.0" - -[[package]] -name = "flake8-bandit" -version = "3.0.0" -description = "Automated security testing with bandit and flake8." -optional = false -python-versions = ">=3.6" -files = [ - {file = "flake8_bandit-3.0.0-py2.py3-none-any.whl", hash = "sha256:61b617f4f7cdaa0e2b1e6bf7b68afb2b619a227bb3e3ae00dd36c213bd17900a"}, - {file = "flake8_bandit-3.0.0.tar.gz", hash = "sha256:54d19427e6a8d50322a7b02e1841c0a7c22d856975f3459803320e0e18e2d6a1"}, -] - -[package.dependencies] -bandit = ">=1.7.3" -flake8 = "*" -flake8-polyfill = "*" -pycodestyle = "*" - -[[package]] -name = "flake8-bugbear" -version = "22.12.6" -description = "A plugin for flake8 finding likely bugs and design problems in your program. Contains warnings that don't belong in pyflakes and pycodestyle." -optional = false -python-versions = ">=3.7" -files = [ - {file = "flake8-bugbear-22.12.6.tar.gz", hash = "sha256:4cdb2c06e229971104443ae293e75e64c6107798229202fbe4f4091427a30ac0"}, - {file = "flake8_bugbear-22.12.6-py3-none-any.whl", hash = "sha256:b69a510634f8a9c298dfda2b18a8036455e6b19ecac4fe582e4d7a0abfa50a30"}, -] - -[package.dependencies] -attrs = ">=19.2.0" -flake8 = ">=3.0.0" - -[package.extras] -dev = ["coverage", "hypothesis", "hypothesmith (>=0.2)", "pre-commit", "tox"] - -[[package]] -name = "flake8-builtins" -version = "1.5.3" -description = "Check for python builtins being used as variables or parameters." -optional = false -python-versions = "*" -files = [ - {file = "flake8-builtins-1.5.3.tar.gz", hash = "sha256:09998853b2405e98e61d2ff3027c47033adbdc17f9fe44ca58443d876eb00f3b"}, - {file = "flake8_builtins-1.5.3-py2.py3-none-any.whl", hash = "sha256:7706babee43879320376861897e5d1468e396a40b8918ed7bccf70e5f90b8687"}, -] - -[package.dependencies] -flake8 = "*" - -[package.extras] -test = ["coverage", "coveralls", "mock", "pytest", "pytest-cov"] - -[[package]] -name = "flake8-comprehensions" -version = "3.13.0" -description = "A flake8 plugin to help you write better list/set/dict comprehensions." -optional = false -python-versions = ">=3.7" -files = [ - {file = "flake8_comprehensions-3.13.0-py3-none-any.whl", hash = "sha256:cc0d6dbb336ff4e9cdf4eb605a3f719ea59261f2d6ba52034871a173c40e1f60"}, - {file = "flake8_comprehensions-3.13.0.tar.gz", hash = "sha256:83cf98e816c9e23360f36aaf47de59a5b21437fdff8a056c46e2ad49f81861bf"}, -] - -[package.dependencies] -flake8 = ">=3.0,<3.2.0 || >3.2.0" - -[[package]] -name = "flake8-eradicate" -version = "1.4.0" -description = "Flake8 plugin to find commented out code" -optional = false -python-versions = ">=3.7,<4.0" -files = [ - {file = "flake8-eradicate-1.4.0.tar.gz", hash = "sha256:3088cfd6717d1c9c6c3ac45ef2e5f5b6c7267f7504d5a74b781500e95cb9c7e1"}, - {file = "flake8_eradicate-1.4.0-py3-none-any.whl", hash = "sha256:e3bbd0871be358e908053c1ab728903c114f062ba596b4d40c852fd18f473d56"}, -] - -[package.dependencies] -attrs = "*" -eradicate = ">=2.0,<3.0" -flake8 = ">=3.5,<6" - -[[package]] -name = "flake8-isort" -version = "4.2.0" -description = "flake8 plugin that integrates isort ." -optional = false -python-versions = "*" -files = [ - {file = "flake8-isort-4.2.0.tar.gz", hash = "sha256:26571500cd54976bbc0cf1006ffbcd1a68dd102f816b7a1051b219616ba9fee0"}, - {file = "flake8_isort-4.2.0-py3-none-any.whl", hash = "sha256:5b87630fb3719bf4c1833fd11e0d9534f43efdeba524863e15d8f14a7ef6adbf"}, -] - -[package.dependencies] -flake8 = ">=3.2.1,<6" -isort = ">=4.3.5,<6" - -[package.extras] -test = ["pytest-cov"] - -[[package]] -name = "flake8-plugin-utils" -version = "1.3.2" -description = "The package provides base classes and utils for flake8 plugin writing" -optional = false -python-versions = ">=3.6,<4.0" -files = [ - {file = "flake8-plugin-utils-1.3.2.tar.gz", hash = "sha256:20fa2a8ca2decac50116edb42e6af0a1253ef639ad79941249b840531889c65a"}, - {file = "flake8_plugin_utils-1.3.2-py3-none-any.whl", hash = "sha256:1fe43e3e9acf3a7c0f6b88f5338cad37044d2f156c43cb6b080b5f9da8a76f06"}, -] - -[[package]] -name = "flake8-polyfill" -version = "1.0.2" -description = "Polyfill package for Flake8 plugins" -optional = false -python-versions = "*" -files = [ - {file = "flake8-polyfill-1.0.2.tar.gz", hash = "sha256:e44b087597f6da52ec6393a709e7108b2905317d0c0b744cdca6208e670d8eda"}, - {file = "flake8_polyfill-1.0.2-py2.py3-none-any.whl", hash = "sha256:12be6a34ee3ab795b19ca73505e7b55826d5f6ad7230d31b18e106400169b9e9"}, -] - -[package.dependencies] -flake8 = "*" - -[[package]] -name = "flake8-pytest-style" -version = "1.7.2" -description = "A flake8 plugin checking common style issues or inconsistencies with pytest-based tests." -optional = false -python-versions = ">=3.7.2,<4.0.0" +python-versions = ">=3.6.1" files = [ - {file = "flake8_pytest_style-1.7.2-py3-none-any.whl", hash = "sha256:f5d2aa3219163a052dd92226589d45fab8ea027a3269922f0c4029f548ea5cd1"}, - {file = "flake8_pytest_style-1.7.2.tar.gz", hash = "sha256:b924197c99b951315949920b0e5547f34900b1844348432e67a44ab191582109"}, + {file = "flake8-5.0.4-py2.py3-none-any.whl", hash = "sha256:7a1cf6b73744f5806ab95e526f6f0d8c01c66d7bbe349562d22dfca20610b248"}, + {file = "flake8-5.0.4.tar.gz", hash = "sha256:6fbe320aad8d6b95cec8b8e47bc933004678dc63095be98528b7bdd2a9f510db"}, ] [package.dependencies] -flake8-plugin-utils = ">=1.3.2,<2.0.0" +mccabe = ">=0.7.0,<0.8.0" +pycodestyle = ">=2.9.0,<2.10.0" +pyflakes = ">=2.5.0,<2.6.0" [[package]] name = "geojson" @@ -1536,34 +1368,6 @@ files = [ {file = "geojson-3.0.1.tar.gz", hash = "sha256:ff3d75acab60b1e66504a11f7ea12c104bad32ff3c410a807788663b966dee4a"}, ] -[[package]] -name = "gitdb" -version = "4.0.10" -description = "Git Object Database" -optional = false -python-versions = ">=3.7" -files = [ - {file = "gitdb-4.0.10-py3-none-any.whl", hash = "sha256:c286cf298426064079ed96a9e4a9d39e7f3e9bf15ba60701e95f5492f28415c7"}, - {file = "gitdb-4.0.10.tar.gz", hash = "sha256:6eb990b69df4e15bad899ea868dc46572c3f75339735663b81de79b06f17eb9a"}, -] - -[package.dependencies] -smmap = ">=3.0.1,<6" - -[[package]] -name = "gitpython" -version = "3.1.31" -description = "GitPython is a Python library used to interact with Git repositories" -optional = false -python-versions = ">=3.7" -files = [ - {file = "GitPython-3.1.31-py3-none-any.whl", hash = "sha256:f04893614f6aa713a60cbbe1e6a97403ef633103cdd0ef5eb6efe0deb98dbe8d"}, - {file = "GitPython-3.1.31.tar.gz", hash = "sha256:8ce3bcf69adfdf7c7d503e78fd3b1c492af782d58893b650adb2ac8912ddd573"}, -] - -[package.dependencies] -gitdb = ">=4.0.1,<5" - [[package]] name = "greenlet" version = "2.0.2" @@ -1684,89 +1488,89 @@ files = [ [[package]] name = "ijson" -version = "3.2.1" +version = "3.2.2" description = "Iterative JSON parser with standard Python iterator interfaces" optional = false python-versions = "*" files = [ - {file = "ijson-3.2.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:6f827f6961f093e1055a2be0c3137f0e7d667979da455ac9648f72d4a2bb8970"}, - {file = "ijson-3.2.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b6e51f4497065cd0d09f5e906cd538a8d22609eab716e3c883769acf147ab1b6"}, - {file = "ijson-3.2.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:f022686c40bff3e340627a5a0c9212718d529e787ada3b76ba546d47a9ecdbbd"}, - {file = "ijson-3.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4105c15a13fa1dc24ebd3bf2e679fa14dcbfcc48bc39138a0fa3f4ddf6cc09b"}, - {file = "ijson-3.2.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:404423e666f185dfb753ddc92705c84dffdc4cc872aaf825bbe0607893cb5b02"}, - {file = "ijson-3.2.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:39e71f32830827cf21d0233a814092e5a23668e18f52eca5cac4f670d9df1240"}, - {file = "ijson-3.2.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:43af7ed5292caa1452747e2b62485b6c0ece4bcbc5bf6f2758abd547e4124a14"}, - {file = "ijson-3.2.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e805aa6897a11b0f73f1f6bca078981df8960aeeccf527a214f240409c742bab"}, - {file = "ijson-3.2.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5b2df0bd84889e9017a670328fe3e82ec509fd6744c7ac2c99c7ee2300d76afa"}, - {file = "ijson-3.2.1-cp310-cp310-win32.whl", hash = "sha256:675259c7ea7f51ffaf8cb9e79bf875e28bb09622892943f4f415588fd7ab7bec"}, - {file = "ijson-3.2.1-cp310-cp310-win_amd64.whl", hash = "sha256:90d4b2eb771a3585c8186820fe50e3282ef62477b865e765a50a8295674abeac"}, - {file = "ijson-3.2.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:fc581a61e210bf6013c1fa6536566e51127be1cfbd69539b63d8b813206d2fe0"}, - {file = "ijson-3.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:75cdf7ad4c00a8f5ac94ff27e3b7c1bf5ac463f125bca2be1744c5bc9600db5c"}, - {file = "ijson-3.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:85a2bf4636ace4d92e7c5d857a1c5694f42407c868953cf2927f18127bcd0d58"}, - {file = "ijson-3.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9fe0cb66e7dd4aa11da5fff60bdf5ee04819a5e6a57acf7ca12c65f7fc009afc"}, - {file = "ijson-3.2.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c6f7957ad38cb714378944032f2c2ee9c6531b5b0b38c5ccd08cedbb0ceddd02"}, - {file = "ijson-3.2.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:13283d264cca8a63e5bad91e82eec39711e95893e7e8d4a419799a8c5f85203a"}, - {file = "ijson-3.2.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:12c24cde850fe79bc806be0e9fc38b47dd5ac0a223070ccb12e9b695425e2936"}, - {file = "ijson-3.2.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:2ce8eed838e5a0791cb5948117b5453f2b3b3c28d93d06ee2bbf2c198c47881c"}, - {file = "ijson-3.2.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:b81c2589f191b0dc741f532be00b4bea617297dd9698431c8053e2d28272d4db"}, - {file = "ijson-3.2.1-cp311-cp311-win32.whl", hash = "sha256:ba2beac56ac96f728d0f2430e4c667c66819a423d321bb9db9ebdebd803e1b5b"}, - {file = "ijson-3.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:c71614ed4bbc6a32ff1e42d7ce92a176fb67d658913343792d2c4567aa130817"}, - {file = "ijson-3.2.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:683fc8b0ea085e75ea34044fdc70649b37367d494f132a2bd1e59d7135054d89"}, - {file = "ijson-3.2.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:deeaecec2f4e20e8bec20b0a5cdc34daebe7903f2e700f7dcaef68b5925d35ea"}, - {file = "ijson-3.2.1-cp36-cp36m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:11923ac3188877f19dbb7051f7345202701cc39bf8e5ac44f8ae536c9eca8c82"}, - {file = "ijson-3.2.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:400deefcdae21e90fc39c1dcfc6ba2df24537e8c65bd57b763ed5256b73ba64d"}, - {file = "ijson-3.2.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:56bc4bad53770710a3a91944fe640fdeb269987a14352b74ebbad2aa55801c00"}, - {file = "ijson-3.2.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:f5a179523e085126844c6161aabcd193dbb5747bd01fadb68e92abf048f32ec9"}, - {file = "ijson-3.2.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:ee24655986e4415fbb7a0cf51445fff3072ceac0e219f4bbbd5c53535a3c5680"}, - {file = "ijson-3.2.1-cp36-cp36m-win32.whl", hash = "sha256:4a5c672b0540005c1bb0bba97aa559a87a2e4ee409fc68e2f5ba5b30f009ac99"}, - {file = "ijson-3.2.1-cp36-cp36m-win_amd64.whl", hash = "sha256:cfaf1d89b0e122e69c87a15db6d6f44feb9db96d2af7fe88cdc464177a257b5d"}, - {file = "ijson-3.2.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:1cbd052eb67c1b3611f25974ba967886e89391faaf55afec93808c19f06ca612"}, - {file = "ijson-3.2.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f13ffc491886e5d7bde7d68712d168bce0141b2a918db1164bc8599c0123e293"}, - {file = "ijson-3.2.1-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bc4c4fc6bafc777f8422fe36edb1cbd72a13cb29695893a064c9c95776a4bdf9"}, - {file = "ijson-3.2.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a42fcb2bf9748c26f004690b2feb6e13e4875bb7c9d83535f887c21e0a982a7c"}, - {file = "ijson-3.2.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:0c92f7bc2f3a947c2ba7f7aa48382c36079f8259c930e81d9164341f9b853c45"}, - {file = "ijson-3.2.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:fd497042db562379339660e787bc8679ed3abaa740768d39bc3746e769e7c7a5"}, - {file = "ijson-3.2.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:7d61c7cd8ddd75dcef818ff5a111a31b902a6a0e410ee0c2b2ecaa6dac92658a"}, - {file = "ijson-3.2.1-cp37-cp37m-win32.whl", hash = "sha256:36caf624d263fc40e7e805d759d09ea368d8cf497aecb3241ac2f0a286ad8eca"}, - {file = "ijson-3.2.1-cp37-cp37m-win_amd64.whl", hash = "sha256:32f9ed25ff80942e433119600bca13b86a8f9b8b0966edbc1d91a48ccbdd4d54"}, - {file = "ijson-3.2.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e89bbd747140eac3a3c9e7e5835b90d85c4a02763fc5134861bfc1ea03b66ae7"}, - {file = "ijson-3.2.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d69b4b1d509de36ec42a0e4af30ede39fb754e4039b2928ef7282ebc2125ffdd"}, - {file = "ijson-3.2.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:e7feb0771f50deabe6ce85b210fa9e005843d3d3c60fb3315d69e1f9d0d75e0c"}, - {file = "ijson-3.2.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5fd8148a363888054ff06eaaa1103f2f98720ab39666084a214e4fedfc13cf64"}, - {file = "ijson-3.2.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:598638dcc5141e9ae269903901877103f5362e0db4443e34721df8f8d34577b4"}, - {file = "ijson-3.2.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e979190b7d0fabca20d6b7224ab1c1aa461ad1ab72ba94f1bb1e5894cd59f342"}, - {file = "ijson-3.2.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:bc810eb80b4f486c7957201ba2a53f53ddc9b3233af67e4359e29371bf04883b"}, - {file = "ijson-3.2.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:26e758584611dfe826dd18ffd94dc0d8a062ce56e41674ad3bfa371c7b78c4b5"}, - {file = "ijson-3.2.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:24e9ae5b35b85ea094b6c36495bc856089254aed6a48bada8d7eec5a04f74439"}, - {file = "ijson-3.2.1-cp38-cp38-win32.whl", hash = "sha256:4b5dc7b5b4b8cb3087d188f37911cd67e26672d33d3571e73440de3f0a86f7e6"}, - {file = "ijson-3.2.1-cp38-cp38-win_amd64.whl", hash = "sha256:1af94ff40609270bbb3eac47e072582bb578f5023fac8408cccd80fe5892d221"}, - {file = "ijson-3.2.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2dda67affceebc52c8bc5fe72c3a4a1e338e4d4b0497dbac5089c2d3862df214"}, - {file = "ijson-3.2.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bd780303ddfedc8d57cdb9f2d53a8cea2f2f4a6fb857bf8fe5a0c3ab1d4ca901"}, - {file = "ijson-3.2.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4fbab6af1bab88a8e46beda08cf44610eed0adb8d157a1a60b4bb6c3a121c6de"}, - {file = "ijson-3.2.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c97a07988a1e0ce2bc8e8a62eb5f25195a3bd58a939ac353cbc6018a548cc08d"}, - {file = "ijson-3.2.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a65671a6826ae723837143914c823ad7bcc0d1a3e38d87c71df897a2556fb48f"}, - {file = "ijson-3.2.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a1806372008bbed9ee92db5747e38c047fa1c4ee89cb2dd5daaa57feb46ce50a"}, - {file = "ijson-3.2.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:91e5a8e96f78a59e2520078c227a4fec5bf91c13adeded9e33fb13981cb823c3"}, - {file = "ijson-3.2.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:1f820fce8ef093718f2319ff6f1322390664659b783775919dadccb1b470153d"}, - {file = "ijson-3.2.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:bca3e8c91a1076a20620dbaa6a2848772b0e8a4055e86d42d3fa39221b53ed1a"}, - {file = "ijson-3.2.1-cp39-cp39-win32.whl", hash = "sha256:de87f137b7438d43840f4339a37d4e6a58c987f4bb2a70609969f854f8ae20f3"}, - {file = "ijson-3.2.1-cp39-cp39-win_amd64.whl", hash = "sha256:0caebb8350b47266a58b766ec08e1de441d6d160702c428b5cf7504d93c832c4"}, - {file = "ijson-3.2.1-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:37389785c1abd27fcc24800fcfa9a6b1022743413e4056507fd32356b623ff33"}, - {file = "ijson-3.2.1-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4b364b82231d51cbeae52468c3b27e8a042e544ab764c8f3975e912cf010603f"}, - {file = "ijson-3.2.1-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a5999d0ec28a8ec47cf20c736fd4f895dc077bf6441bf237b00b074315a295d"}, - {file = "ijson-3.2.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8bd481857a39305517fb6f1313d558c2dc4e78c9e9384cc5bc1c3e28f1afbedf"}, - {file = "ijson-3.2.1-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:545f62f12f89350d4d73f2a779cb269198ae578fac080085a1927148b803e602"}, - {file = "ijson-3.2.1-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:4d5622505d01c2f3d7b9638c1eb8c747eb550936b505225893704289ff28576f"}, - {file = "ijson-3.2.1-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20293bb36423b129fad3753858ccf7b2ccb5b2c0d3759efe810d0b9d79633a7e"}, - {file = "ijson-3.2.1-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7cd8a4921b852fd2cb5b0c985540c97ff6893139a57fe7121d510ec5d1c0ca44"}, - {file = "ijson-3.2.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dc902ff1ae1efed7d526294d7a9dd3df66d29b2cdc05fb5479838fef1327a534"}, - {file = "ijson-3.2.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:2925a7978d8170146a9cb49a15a982b71fbbf21980bf2e16cd90c528545b7c02"}, - {file = "ijson-3.2.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:c21c6509f6944939399f3630c5dc424d30d71d375f6cd58f9af56158fdf7251c"}, - {file = "ijson-3.2.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5729fc7648bc972d70922d7dad15459cca3a9e5ed0328eb9ae3ffa004066194"}, - {file = "ijson-3.2.1-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:805a2d5ed5a15d60327bc9347f2d4125ab621fb18071db98b1c598f1ee99e8f1"}, - {file = "ijson-3.2.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d0220a4b6c63f44589e429157174e3f4b8d1e534d5fb82bdb43a7f8dd77ae4b"}, - {file = "ijson-3.2.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:271d9b7c083f65c58ff0afd9dbb5d2f3d445f734632aebfef4a261b0a337abdb"}, - {file = "ijson-3.2.1.tar.gz", hash = "sha256:8574bf19f31fab870488769ad919a80f130825236ac8bde9a733f69c2961d7a7"}, + {file = "ijson-3.2.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:ac48d9b11782ed6198efedae29761a1f4fb0a87485c7a7fdecf790825629c1c8"}, + {file = "ijson-3.2.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:afb95a065eb3179a4e0765e9c48e2ffb5a43aba583ceae3891d52e75ee94f01c"}, + {file = "ijson-3.2.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:34126c5c8027116d94a6725ba0bbd12727e4d5a0c5592f5ba636bd141fc7ed70"}, + {file = "ijson-3.2.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:861d15df0783e8a96311b6bcbd45b1a738bf938fd2240eeec4e84a2def0dd16a"}, + {file = "ijson-3.2.2-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f5356b7776951756a7a7e310f12cf525c516d60b7f834c946844ce2dfef58a0a"}, + {file = "ijson-3.2.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:60289cadada7e3d4499730e6340d493ef9ca7de31fae9e5381809f99bada38f5"}, + {file = "ijson-3.2.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:77ca22acd49f1e6cf9e1747a82cfec2a919f00c93c882218e4773aa7f9121dff"}, + {file = "ijson-3.2.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:f677ce65733e385c049ef90d527c4d7312120e0f68fd9bf0d33021c374398576"}, + {file = "ijson-3.2.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:faabf7789769ac73b8be3ca7baf76e9fce3901bfeeebc9682edb2a5f0314b9d3"}, + {file = "ijson-3.2.2-cp310-cp310-win32.whl", hash = "sha256:27d2383190cbe0560fe91a99e7c35aa8e46c41283fc6fcb8d00a08d19cfc3ff0"}, + {file = "ijson-3.2.2-cp310-cp310-win_amd64.whl", hash = "sha256:737384969a1e94c508be4109fda4bb060d81aa2f21d52cdfd32568ace98bec5d"}, + {file = "ijson-3.2.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:0199456b6b3d830d8850c99327da5fad293ead515e656768941263e8c588ff28"}, + {file = "ijson-3.2.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:580c6635d3cf3c591b43e6c70e70b945bb947d23b1651cf7e8c0bb770b25852f"}, + {file = "ijson-3.2.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e51cbf1c3659ae88ebeae597a7e8a4f5b92be9678a235dd5317ff76b3b3017e5"}, + {file = "ijson-3.2.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:edbc3fdfcba8c68437d9799e2ebe36f338e2149b546fc6b0de7dbb4067980fca"}, + {file = "ijson-3.2.2-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e62b879d85d3000541997244bbaa45eccbaf50e4bbde8239ba2011fec9ce1f9c"}, + {file = "ijson-3.2.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9f3c95f8694ccd018159d51e25dd87f8021880ef49a52a5a91ea946d8e18d35e"}, + {file = "ijson-3.2.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:97b7ee99be6f564b4bab7317a060469d5a18bcfa0ae85f9be3db1c2146694977"}, + {file = "ijson-3.2.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:0cf5911658aa102a6c726bca58a72a08b910cc97e4168ae3a9b308b826f95194"}, + {file = "ijson-3.2.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:b75592e9196294eb4e19cde4d4f39dcdc3eefddcdfbc96ae7ec8843d0817e802"}, + {file = "ijson-3.2.2-cp311-cp311-win32.whl", hash = "sha256:d9c3919a2f937b9771d6e4d2e4dfd5ab9596c9cc63ba06471ad612525e13eef2"}, + {file = "ijson-3.2.2-cp311-cp311-win_amd64.whl", hash = "sha256:ba97de4442c031181581f16695308528380fd0ba904adc7ed1799b077fc61a15"}, + {file = "ijson-3.2.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3f1d3979951288000534b258461ce5d9388078c306d9c12af04153bb6a5f36f3"}, + {file = "ijson-3.2.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9eec9d145d6ea6bd24ca147c07a49f80a9feadbe3d0b665d6144f2f94d6bf06f"}, + {file = "ijson-3.2.2-cp36-cp36m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3d8b55e6bc5e1e079a834f5bbfc30b0cc49444e1e9a33f1e4bede933dfecdabc"}, + {file = "ijson-3.2.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:13957abec999a5961cd046125e667c33c79feb8e876efea6f2f86b188c3172f2"}, + {file = "ijson-3.2.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:7b93a76ac6f07c1f32323cde2ab90758d2dd229f3cf193c09616de211be25bb3"}, + {file = "ijson-3.2.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:07151b4d83763a5e3ee8f61c1dcd350f6a955c60200cd1d8f9989049667fa3c4"}, + {file = "ijson-3.2.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:759397feea371ac757033884896a92b881fbba284a93751681c2d2397aa82634"}, + {file = "ijson-3.2.2-cp36-cp36m-win32.whl", hash = "sha256:af0ff99cbdb0fb2d176d3fba1035a957bb52e1f7c3b579d06159f78e7520801d"}, + {file = "ijson-3.2.2-cp36-cp36m-win_amd64.whl", hash = "sha256:53092b6408a1671b2ed10a153b277bd718d76fed311a34643792a488dea6a6eb"}, + {file = "ijson-3.2.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:dd591fb5d8e86c4e79be5a48d4489af064f10de679fe4697842c4812ff678628"}, + {file = "ijson-3.2.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b65ea9b9932d9baa716188914c8b40d677f4e23bd94a45f42da45d064cb69677"}, + {file = "ijson-3.2.2-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7d809f8ba3295c2d91bdc4f4a522c93973481a6d09232481e5b056fe88294bf0"}, + {file = "ijson-3.2.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6a3972531b04e86725f5c0e9b55a91024278235b40d1a80fee53edc5e0b73634"}, + {file = "ijson-3.2.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:938ef367eef58287b65b721e7f769346f8e5bcc6726330dcb11ffd131ef633f8"}, + {file = "ijson-3.2.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:68bc6e4d0bdb1afcdbc7747ea75859f784942d82d359d1b2d5a88d18a7ac0cca"}, + {file = "ijson-3.2.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:4faca5c72ab53462f2f688ac9cfc5e31974bb46a539bca78d0830e5b28635b63"}, + {file = "ijson-3.2.2-cp37-cp37m-win32.whl", hash = "sha256:e5e103494cb05fc814c00eda9e5e32f6a0ddc0a85fd9763df41548946bd04c0f"}, + {file = "ijson-3.2.2-cp37-cp37m-win_amd64.whl", hash = "sha256:a5ff3714342262a748d21f55ebff350247c2ad64c506f9361cd2204d5fe390d7"}, + {file = "ijson-3.2.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:8febaa3d81d0c62ba16ae10bd112edfa2e2b24a481a9952ba56770b6f1947d4a"}, + {file = "ijson-3.2.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:360c234f2759103fc024ae6e257f92689e0d48d96346dbcacbbbe81fbad7712e"}, + {file = "ijson-3.2.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:e96631f4dd97a1f9ff9bb8c816a7794a202753d34048ecb9d5a4b0bf7a55c5e3"}, + {file = "ijson-3.2.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3700d5d9d196ce4b9da40a09f49e05e75d64f45765dbebe5cb4af74ec6dc039b"}, + {file = "ijson-3.2.2-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:72007e353e00292a8b9d7a2558b1360d4351fae806fddc31832964228ce20698"}, + {file = "ijson-3.2.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5f03c1b1285743e6b688d2927105d1e6c5e6837832db88c9d57550219e757ae8"}, + {file = "ijson-3.2.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ab56d4f8e40ebb4004ffcddeeab982900dabfa7fef4b58a6654da3ca678d339a"}, + {file = "ijson-3.2.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:dd4f9a69c0aef16f088804beb2d2c7e9e430b388f628de9116f2874440ffb45d"}, + {file = "ijson-3.2.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ed0de6b9a3082b28ecc5e5ae72dac8a5378ef1b50cf11f21d65a5d5343c0327d"}, + {file = "ijson-3.2.2-cp38-cp38-win32.whl", hash = "sha256:88b3547a702a5c5038dd1b99ebf2116af6c40c9dba246d51662e8c9f739e25f7"}, + {file = "ijson-3.2.2-cp38-cp38-win_amd64.whl", hash = "sha256:1c3643092a7895a7ffc21b6188d79de4ed0f4f4052eb278c6d7e20387f7d7074"}, + {file = "ijson-3.2.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:40cbd9d14ff6fd4d6dd047cbec31e0c25466c91489378753c9c5feb78bfd23ba"}, + {file = "ijson-3.2.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2a47e44dd758304e88b679eed6d322a1ad6feffb124d74d9f59071003243c9c9"}, + {file = "ijson-3.2.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:54df86de05de3a1cf1269a1cd161468df542765720b5717d0740048fc0d57363"}, + {file = "ijson-3.2.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ac7c78f99003e340b0d4c2465ecaf75505686c7fd4abbb21187ad009823ecd33"}, + {file = "ijson-3.2.2-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c0c7ad1df5ce587815dbfa2db09e110ebe43ada287736a1bf00e783e9d6bcc14"}, + {file = "ijson-3.2.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:08debb0373ff86dd912b3d8fd4e40b759fc2d474191754beb72ea1044edb8947"}, + {file = "ijson-3.2.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:68aecc259ec213e2af9ce9472e7cc7f8158420229c8dcf0338528bf4261dbaf9"}, + {file = "ijson-3.2.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:8d4cf867c3fe88981bac3094e0842047811e5bf3894abb6d8b3408a25cd8a177"}, + {file = "ijson-3.2.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a86c05d08f6f122e60dc391859144bd61d2d9be880d257f61bb267a4b2556b0d"}, + {file = "ijson-3.2.2-cp39-cp39-win32.whl", hash = "sha256:f1dbb2f38a816066669875ef0ac5f65389e9678ee922301e05d411404b443dc5"}, + {file = "ijson-3.2.2-cp39-cp39-win_amd64.whl", hash = "sha256:4f206866b90ff79702b82aee5910e52a6a1a2a8d91333ad3454d17cde996eea2"}, + {file = "ijson-3.2.2-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b21ad922095a6bdc3d284680f601367de8ccafdde1c6f1515ac1004499b58939"}, + {file = "ijson-3.2.2-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9f6debf5f06d628ae43a680d6ecd0e26d2c3c54b0b1e1c3a103a7085545e5dd1"}, + {file = "ijson-3.2.2-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5d2a4fafcddb0dc7a716df7e68fa4bb8b226d8cf54af27c2e614ca2249989950"}, + {file = "ijson-3.2.2-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3575ccf1119ed5d373fa7de882978e8e6172ffe16bae9dbb4ca708caf45bcee0"}, + {file = "ijson-3.2.2-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:48e0925dea7a4357cd824ef71834f1e444fd9d9536b076a304e4e3219c0133d5"}, + {file = "ijson-3.2.2-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:a5001813b8d6558bda9af6bb24a3fae99377d92eb6b41ddd1ec4df548683d604"}, + {file = "ijson-3.2.2-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:95a16530f07fd576a70cc3482f9935d1b5f7207e87cf62facfa19b9d027977c4"}, + {file = "ijson-3.2.2-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4a981d22b8f89be2db50def8a9e92d87c3b86f4e36be5d93130962654f5baa3f"}, + {file = "ijson-3.2.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f1d59dfc5cb2f0c9ba756b0a63070e8e3f015318a56fb396f3046f9df0b48042"}, + {file = "ijson-3.2.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:bfa3d2fa57225d90af42c436a23c1829c6b8c40ce105534266f81a98755d6fb2"}, + {file = "ijson-3.2.2-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:8eddcf9a7d08e404231d8457b856ba9b62aa0b4cdcf2bf64b3bac2e8eca73743"}, + {file = "ijson-3.2.2-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fee77bbdf86d3c64219479a06f95bd737bce376c2ab04df36c8c386505ada678"}, + {file = "ijson-3.2.2-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:822f2fe7a3c1e2ff62b2578159a7b4bf752db308eb907276a528dd6b919a232e"}, + {file = "ijson-3.2.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:163fe391bfb7a024063d7020b0afc0db615d5bf112e92acc87d93b627c53c7b1"}, + {file = "ijson-3.2.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:0aa0e0bbd205ee8ad4f64443f002cc23f668492c96d19d3181d1904fc9a46eb6"}, + {file = "ijson-3.2.2.tar.gz", hash = "sha256:b9883c8716001d7a5c8185905208e40a77eef9b2a73dbce4d189ceb092aa93bd"}, ] [[package]] @@ -1782,13 +1586,13 @@ files = [ [[package]] name = "importlib-metadata" -version = "6.7.0" +version = "6.8.0" description = "Read metadata from Python packages" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "importlib_metadata-6.7.0-py3-none-any.whl", hash = "sha256:cb52082e659e97afc5dac71e79de97d8681de3aa07ff18578330904a9d18e5b5"}, - {file = "importlib_metadata-6.7.0.tar.gz", hash = "sha256:1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4"}, + {file = "importlib_metadata-6.8.0-py3-none-any.whl", hash = "sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb"}, + {file = "importlib_metadata-6.8.0.tar.gz", hash = "sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743"}, ] [package.dependencies] @@ -1797,7 +1601,7 @@ zipp = ">=0.5" [package.extras] docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] perf = ["ipython"] -testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)", "pytest-ruff"] +testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)", "pytest-ruff"] [[package]] name = "iniconfig" @@ -2103,95 +1907,108 @@ develop = ["tox"] [[package]] name = "lxml" -version = "4.9.2" +version = "4.9.3" description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, != 3.4.*" files = [ - {file = "lxml-4.9.2-cp27-cp27m-macosx_10_15_x86_64.whl", hash = "sha256:76cf573e5a365e790396a5cc2b909812633409306c6531a6877c59061e42c4f2"}, - {file = "lxml-4.9.2-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b1f42b6921d0e81b1bcb5e395bc091a70f41c4d4e55ba99c6da2b31626c44892"}, - {file = "lxml-4.9.2-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:9f102706d0ca011de571de32c3247c6476b55bb6bc65a20f682f000b07a4852a"}, - {file = "lxml-4.9.2-cp27-cp27m-win32.whl", hash = "sha256:8d0b4612b66ff5d62d03bcaa043bb018f74dfea51184e53f067e6fdcba4bd8de"}, - {file = "lxml-4.9.2-cp27-cp27m-win_amd64.whl", hash = "sha256:4c8f293f14abc8fd3e8e01c5bd86e6ed0b6ef71936ded5bf10fe7a5efefbaca3"}, - {file = "lxml-4.9.2-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2899456259589aa38bfb018c364d6ae7b53c5c22d8e27d0ec7609c2a1ff78b50"}, - {file = "lxml-4.9.2-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6749649eecd6a9871cae297bffa4ee76f90b4504a2a2ab528d9ebe912b101975"}, - {file = "lxml-4.9.2-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:a08cff61517ee26cb56f1e949cca38caabe9ea9fbb4b1e10a805dc39844b7d5c"}, - {file = "lxml-4.9.2-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:85cabf64adec449132e55616e7ca3e1000ab449d1d0f9d7f83146ed5bdcb6d8a"}, - {file = "lxml-4.9.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:8340225bd5e7a701c0fa98284c849c9b9fc9238abf53a0ebd90900f25d39a4e4"}, - {file = "lxml-4.9.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:1ab8f1f932e8f82355e75dda5413a57612c6ea448069d4fb2e217e9a4bed13d4"}, - {file = "lxml-4.9.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:699a9af7dffaf67deeae27b2112aa06b41c370d5e7633e0ee0aea2e0b6c211f7"}, - {file = "lxml-4.9.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b9cc34af337a97d470040f99ba4282f6e6bac88407d021688a5d585e44a23184"}, - {file = "lxml-4.9.2-cp310-cp310-win32.whl", hash = "sha256:d02a5399126a53492415d4906ab0ad0375a5456cc05c3fc0fc4ca11771745cda"}, - {file = "lxml-4.9.2-cp310-cp310-win_amd64.whl", hash = "sha256:a38486985ca49cfa574a507e7a2215c0c780fd1778bb6290c21193b7211702ab"}, - {file = "lxml-4.9.2-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:c83203addf554215463b59f6399835201999b5e48019dc17f182ed5ad87205c9"}, - {file = "lxml-4.9.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:2a87fa548561d2f4643c99cd13131acb607ddabb70682dcf1dff5f71f781a4bf"}, - {file = "lxml-4.9.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:d6b430a9938a5a5d85fc107d852262ddcd48602c120e3dbb02137c83d212b380"}, - {file = "lxml-4.9.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:3efea981d956a6f7173b4659849f55081867cf897e719f57383698af6f618a92"}, - {file = "lxml-4.9.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:df0623dcf9668ad0445e0558a21211d4e9a149ea8f5666917c8eeec515f0a6d1"}, - {file = "lxml-4.9.2-cp311-cp311-win32.whl", hash = "sha256:da248f93f0418a9e9d94b0080d7ebc407a9a5e6d0b57bb30db9b5cc28de1ad33"}, - {file = "lxml-4.9.2-cp311-cp311-win_amd64.whl", hash = "sha256:3818b8e2c4b5148567e1b09ce739006acfaa44ce3156f8cbbc11062994b8e8dd"}, - {file = "lxml-4.9.2-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ca989b91cf3a3ba28930a9fc1e9aeafc2a395448641df1f387a2d394638943b0"}, - {file = "lxml-4.9.2-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:822068f85e12a6e292803e112ab876bc03ed1f03dddb80154c395f891ca6b31e"}, - {file = "lxml-4.9.2-cp35-cp35m-win32.whl", hash = "sha256:be7292c55101e22f2a3d4d8913944cbea71eea90792bf914add27454a13905df"}, - {file = "lxml-4.9.2-cp35-cp35m-win_amd64.whl", hash = "sha256:998c7c41910666d2976928c38ea96a70d1aa43be6fe502f21a651e17483a43c5"}, - {file = "lxml-4.9.2-cp36-cp36m-macosx_10_15_x86_64.whl", hash = "sha256:b26a29f0b7fc6f0897f043ca366142d2b609dc60756ee6e4e90b5f762c6adc53"}, - {file = "lxml-4.9.2-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:ab323679b8b3030000f2be63e22cdeea5b47ee0abd2d6a1dc0c8103ddaa56cd7"}, - {file = "lxml-4.9.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:689bb688a1db722485e4610a503e3e9210dcc20c520b45ac8f7533c837be76fe"}, - {file = "lxml-4.9.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:f49e52d174375a7def9915c9f06ec4e569d235ad428f70751765f48d5926678c"}, - {file = "lxml-4.9.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:36c3c175d34652a35475a73762b545f4527aec044910a651d2bf50de9c3352b1"}, - {file = "lxml-4.9.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:a35f8b7fa99f90dd2f5dc5a9fa12332642f087a7641289ca6c40d6e1a2637d8e"}, - {file = "lxml-4.9.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:58bfa3aa19ca4c0f28c5dde0ff56c520fbac6f0daf4fac66ed4c8d2fb7f22e74"}, - {file = "lxml-4.9.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:bc718cd47b765e790eecb74d044cc8d37d58562f6c314ee9484df26276d36a38"}, - {file = "lxml-4.9.2-cp36-cp36m-win32.whl", hash = "sha256:d5bf6545cd27aaa8a13033ce56354ed9e25ab0e4ac3b5392b763d8d04b08e0c5"}, - {file = "lxml-4.9.2-cp36-cp36m-win_amd64.whl", hash = "sha256:3ab9fa9d6dc2a7f29d7affdf3edebf6ece6fb28a6d80b14c3b2fb9d39b9322c3"}, - {file = "lxml-4.9.2-cp37-cp37m-macosx_10_15_x86_64.whl", hash = "sha256:05ca3f6abf5cf78fe053da9b1166e062ade3fa5d4f92b4ed688127ea7d7b1d03"}, - {file = "lxml-4.9.2-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:a5da296eb617d18e497bcf0a5c528f5d3b18dadb3619fbdadf4ed2356ef8d941"}, - {file = "lxml-4.9.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:04876580c050a8c5341d706dd464ff04fd597095cc8c023252566a8826505726"}, - {file = "lxml-4.9.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:c9ec3eaf616d67db0764b3bb983962b4f385a1f08304fd30c7283954e6a7869b"}, - {file = "lxml-4.9.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2a29ba94d065945944016b6b74e538bdb1751a1db6ffb80c9d3c2e40d6fa9894"}, - {file = "lxml-4.9.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:a82d05da00a58b8e4c0008edbc8a4b6ec5a4bc1e2ee0fb6ed157cf634ed7fa45"}, - {file = "lxml-4.9.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:223f4232855ade399bd409331e6ca70fb5578efef22cf4069a6090acc0f53c0e"}, - {file = "lxml-4.9.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d17bc7c2ccf49c478c5bdd447594e82692c74222698cfc9b5daae7ae7e90743b"}, - {file = "lxml-4.9.2-cp37-cp37m-win32.whl", hash = "sha256:b64d891da92e232c36976c80ed7ebb383e3f148489796d8d31a5b6a677825efe"}, - {file = "lxml-4.9.2-cp37-cp37m-win_amd64.whl", hash = "sha256:a0a336d6d3e8b234a3aae3c674873d8f0e720b76bc1d9416866c41cd9500ffb9"}, - {file = "lxml-4.9.2-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:da4dd7c9c50c059aba52b3524f84d7de956f7fef88f0bafcf4ad7dde94a064e8"}, - {file = "lxml-4.9.2-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:821b7f59b99551c69c85a6039c65b75f5683bdc63270fec660f75da67469ca24"}, - {file = "lxml-4.9.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:e5168986b90a8d1f2f9dc1b841467c74221bd752537b99761a93d2d981e04889"}, - {file = "lxml-4.9.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:8e20cb5a47247e383cf4ff523205060991021233ebd6f924bca927fcf25cf86f"}, - {file = "lxml-4.9.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:13598ecfbd2e86ea7ae45ec28a2a54fb87ee9b9fdb0f6d343297d8e548392c03"}, - {file = "lxml-4.9.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:880bbbcbe2fca64e2f4d8e04db47bcdf504936fa2b33933efd945e1b429bea8c"}, - {file = "lxml-4.9.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:7d2278d59425777cfcb19735018d897ca8303abe67cc735f9f97177ceff8027f"}, - {file = "lxml-4.9.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5344a43228767f53a9df6e5b253f8cdca7dfc7b7aeae52551958192f56d98457"}, - {file = "lxml-4.9.2-cp38-cp38-win32.whl", hash = "sha256:925073b2fe14ab9b87e73f9a5fde6ce6392da430f3004d8b72cc86f746f5163b"}, - {file = "lxml-4.9.2-cp38-cp38-win_amd64.whl", hash = "sha256:9b22c5c66f67ae00c0199f6055705bc3eb3fcb08d03d2ec4059a2b1b25ed48d7"}, - {file = "lxml-4.9.2-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:5f50a1c177e2fa3ee0667a5ab79fdc6b23086bc8b589d90b93b4bd17eb0e64d1"}, - {file = "lxml-4.9.2-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:090c6543d3696cbe15b4ac6e175e576bcc3f1ccfbba970061b7300b0c15a2140"}, - {file = "lxml-4.9.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:63da2ccc0857c311d764e7d3d90f429c252e83b52d1f8f1d1fe55be26827d1f4"}, - {file = "lxml-4.9.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:5b4545b8a40478183ac06c073e81a5ce4cf01bf1734962577cf2bb569a5b3bbf"}, - {file = "lxml-4.9.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2e430cd2824f05f2d4f687701144556646bae8f249fd60aa1e4c768ba7018947"}, - {file = "lxml-4.9.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6804daeb7ef69e7b36f76caddb85cccd63d0c56dedb47555d2fc969e2af6a1a5"}, - {file = "lxml-4.9.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:a6e441a86553c310258aca15d1c05903aaf4965b23f3bc2d55f200804e005ee5"}, - {file = "lxml-4.9.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ca34efc80a29351897e18888c71c6aca4a359247c87e0b1c7ada14f0ab0c0fb2"}, - {file = "lxml-4.9.2-cp39-cp39-win32.whl", hash = "sha256:6b418afe5df18233fc6b6093deb82a32895b6bb0b1155c2cdb05203f583053f1"}, - {file = "lxml-4.9.2-cp39-cp39-win_amd64.whl", hash = "sha256:f1496ea22ca2c830cbcbd473de8f114a320da308438ae65abad6bab7867fe38f"}, - {file = "lxml-4.9.2-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:b264171e3143d842ded311b7dccd46ff9ef34247129ff5bf5066123c55c2431c"}, - {file = "lxml-4.9.2-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:0dc313ef231edf866912e9d8f5a042ddab56c752619e92dfd3a2c277e6a7299a"}, - {file = "lxml-4.9.2-pp38-pypy38_pp73-macosx_10_15_x86_64.whl", hash = "sha256:16efd54337136e8cd72fb9485c368d91d77a47ee2d42b057564aae201257d419"}, - {file = "lxml-4.9.2-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:0f2b1e0d79180f344ff9f321327b005ca043a50ece8713de61d1cb383fb8ac05"}, - {file = "lxml-4.9.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:7b770ed79542ed52c519119473898198761d78beb24b107acf3ad65deae61f1f"}, - {file = "lxml-4.9.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:efa29c2fe6b4fdd32e8ef81c1528506895eca86e1d8c4657fda04c9b3786ddf9"}, - {file = "lxml-4.9.2-pp39-pypy39_pp73-macosx_10_15_x86_64.whl", hash = "sha256:7e91ee82f4199af8c43d8158024cbdff3d931df350252288f0d4ce656df7f3b5"}, - {file = "lxml-4.9.2-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:b23e19989c355ca854276178a0463951a653309fb8e57ce674497f2d9f208746"}, - {file = "lxml-4.9.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:01d36c05f4afb8f7c20fd9ed5badca32a2029b93b1750f571ccc0b142531caf7"}, - {file = "lxml-4.9.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:7b515674acfdcadb0eb5d00d8a709868173acece5cb0be3dd165950cbfdf5409"}, - {file = "lxml-4.9.2.tar.gz", hash = "sha256:2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67"}, + {file = "lxml-4.9.3-cp27-cp27m-macosx_11_0_x86_64.whl", hash = "sha256:b0a545b46b526d418eb91754565ba5b63b1c0b12f9bd2f808c852d9b4b2f9b5c"}, + {file = "lxml-4.9.3-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:075b731ddd9e7f68ad24c635374211376aa05a281673ede86cbe1d1b3455279d"}, + {file = "lxml-4.9.3-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:1e224d5755dba2f4a9498e150c43792392ac9b5380aa1b845f98a1618c94eeef"}, + {file = "lxml-4.9.3-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c0781a98ff5e6586926293e59480b64ddd46282953203c76ae15dbbbf302e8bb"}, + {file = "lxml-4.9.3-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:cef2502e7e8a96fe5ad686d60b49e1ab03e438bd9123987994528febd569868e"}, + {file = "lxml-4.9.3-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:b86164d2cff4d3aaa1f04a14685cbc072efd0b4f99ca5708b2ad1b9b5988a991"}, + {file = "lxml-4.9.3-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:42871176e7896d5d45138f6d28751053c711ed4d48d8e30b498da155af39aebd"}, + {file = "lxml-4.9.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:ae8b9c6deb1e634ba4f1930eb67ef6e6bf6a44b6eb5ad605642b2d6d5ed9ce3c"}, + {file = "lxml-4.9.3-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:411007c0d88188d9f621b11d252cce90c4a2d1a49db6c068e3c16422f306eab8"}, + {file = "lxml-4.9.3-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:cd47b4a0d41d2afa3e58e5bf1f62069255aa2fd6ff5ee41604418ca925911d76"}, + {file = "lxml-4.9.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0e2cb47860da1f7e9a5256254b74ae331687b9672dfa780eed355c4c9c3dbd23"}, + {file = "lxml-4.9.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:1247694b26342a7bf47c02e513d32225ededd18045264d40758abeb3c838a51f"}, + {file = "lxml-4.9.3-cp310-cp310-win32.whl", hash = "sha256:cdb650fc86227eba20de1a29d4b2c1bfe139dc75a0669270033cb2ea3d391b85"}, + {file = "lxml-4.9.3-cp310-cp310-win_amd64.whl", hash = "sha256:97047f0d25cd4bcae81f9ec9dc290ca3e15927c192df17331b53bebe0e3ff96d"}, + {file = "lxml-4.9.3-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:1f447ea5429b54f9582d4b955f5f1985f278ce5cf169f72eea8afd9502973dd5"}, + {file = "lxml-4.9.3-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:57d6ba0ca2b0c462f339640d22882acc711de224d769edf29962b09f77129cbf"}, + {file = "lxml-4.9.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:9767e79108424fb6c3edf8f81e6730666a50feb01a328f4a016464a5893f835a"}, + {file = "lxml-4.9.3-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:71c52db65e4b56b8ddc5bb89fb2e66c558ed9d1a74a45ceb7dcb20c191c3df2f"}, + {file = "lxml-4.9.3-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:d73d8ecf8ecf10a3bd007f2192725a34bd62898e8da27eb9d32a58084f93962b"}, + {file = "lxml-4.9.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:0a3d3487f07c1d7f150894c238299934a2a074ef590b583103a45002035be120"}, + {file = "lxml-4.9.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9e28c51fa0ce5674be9f560c6761c1b441631901993f76700b1b30ca6c8378d6"}, + {file = "lxml-4.9.3-cp311-cp311-win32.whl", hash = "sha256:0bfd0767c5c1de2551a120673b72e5d4b628737cb05414f03c3277bf9bed3305"}, + {file = "lxml-4.9.3-cp311-cp311-win_amd64.whl", hash = "sha256:25f32acefac14ef7bd53e4218fe93b804ef6f6b92ffdb4322bb6d49d94cad2bc"}, + {file = "lxml-4.9.3-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:d3ff32724f98fbbbfa9f49d82852b159e9784d6094983d9a8b7f2ddaebb063d4"}, + {file = "lxml-4.9.3-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:48d6ed886b343d11493129e019da91d4039826794a3e3027321c56d9e71505be"}, + {file = "lxml-4.9.3-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:9a92d3faef50658dd2c5470af249985782bf754c4e18e15afb67d3ab06233f13"}, + {file = "lxml-4.9.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b4e4bc18382088514ebde9328da057775055940a1f2e18f6ad2d78aa0f3ec5b9"}, + {file = "lxml-4.9.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:fc9b106a1bf918db68619fdcd6d5ad4f972fdd19c01d19bdb6bf63f3589a9ec5"}, + {file = "lxml-4.9.3-cp312-cp312-win_amd64.whl", hash = "sha256:d37017287a7adb6ab77e1c5bee9bcf9660f90ff445042b790402a654d2ad81d8"}, + {file = "lxml-4.9.3-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:56dc1f1ebccc656d1b3ed288f11e27172a01503fc016bcabdcbc0978b19352b7"}, + {file = "lxml-4.9.3-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:578695735c5a3f51569810dfebd05dd6f888147a34f0f98d4bb27e92b76e05c2"}, + {file = "lxml-4.9.3-cp35-cp35m-win32.whl", hash = "sha256:704f61ba8c1283c71b16135caf697557f5ecf3e74d9e453233e4771d68a1f42d"}, + {file = "lxml-4.9.3-cp35-cp35m-win_amd64.whl", hash = "sha256:c41bfca0bd3532d53d16fd34d20806d5c2b1ace22a2f2e4c0008570bf2c58833"}, + {file = "lxml-4.9.3-cp36-cp36m-macosx_11_0_x86_64.whl", hash = "sha256:64f479d719dc9f4c813ad9bb6b28f8390360660b73b2e4beb4cb0ae7104f1c12"}, + {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:dd708cf4ee4408cf46a48b108fb9427bfa00b9b85812a9262b5c668af2533ea5"}, + {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5c31c7462abdf8f2ac0577d9f05279727e698f97ecbb02f17939ea99ae8daa98"}, + {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:e3cd95e10c2610c360154afdc2f1480aea394f4a4f1ea0a5eacce49640c9b190"}, + {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_28_x86_64.whl", hash = "sha256:4930be26af26ac545c3dffb662521d4e6268352866956672231887d18f0eaab2"}, + {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:4aec80cde9197340bc353d2768e2a75f5f60bacda2bab72ab1dc499589b3878c"}, + {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:14e019fd83b831b2e61baed40cab76222139926b1fb5ed0e79225bc0cae14584"}, + {file = "lxml-4.9.3-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:0c0850c8b02c298d3c7006b23e98249515ac57430e16a166873fc47a5d549287"}, + {file = "lxml-4.9.3-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:aca086dc5f9ef98c512bac8efea4483eb84abbf926eaeedf7b91479feb092458"}, + {file = "lxml-4.9.3-cp36-cp36m-win32.whl", hash = "sha256:50baa9c1c47efcaef189f31e3d00d697c6d4afda5c3cde0302d063492ff9b477"}, + {file = "lxml-4.9.3-cp36-cp36m-win_amd64.whl", hash = "sha256:bef4e656f7d98aaa3486d2627e7d2df1157d7e88e7efd43a65aa5dd4714916cf"}, + {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:46f409a2d60f634fe550f7133ed30ad5321ae2e6630f13657fb9479506b00601"}, + {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:4c28a9144688aef80d6ea666c809b4b0e50010a2aca784c97f5e6bf143d9f129"}, + {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:141f1d1a9b663c679dc524af3ea1773e618907e96075262726c7612c02b149a4"}, + {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:53ace1c1fd5a74ef662f844a0413446c0629d151055340e9893da958a374f70d"}, + {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:17a753023436a18e27dd7769e798ce302963c236bc4114ceee5b25c18c52c693"}, + {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:7d298a1bd60c067ea75d9f684f5f3992c9d6766fadbc0bcedd39750bf344c2f4"}, + {file = "lxml-4.9.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:081d32421db5df44c41b7f08a334a090a545c54ba977e47fd7cc2deece78809a"}, + {file = "lxml-4.9.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:23eed6d7b1a3336ad92d8e39d4bfe09073c31bfe502f20ca5116b2a334f8ec02"}, + {file = "lxml-4.9.3-cp37-cp37m-win32.whl", hash = "sha256:1509dd12b773c02acd154582088820893109f6ca27ef7291b003d0e81666109f"}, + {file = "lxml-4.9.3-cp37-cp37m-win_amd64.whl", hash = "sha256:120fa9349a24c7043854c53cae8cec227e1f79195a7493e09e0c12e29f918e52"}, + {file = "lxml-4.9.3-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:4d2d1edbca80b510443f51afd8496be95529db04a509bc8faee49c7b0fb6d2cc"}, + {file = "lxml-4.9.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:8d7e43bd40f65f7d97ad8ef5c9b1778943d02f04febef12def25f7583d19baac"}, + {file = "lxml-4.9.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:71d66ee82e7417828af6ecd7db817913cb0cf9d4e61aa0ac1fde0583d84358db"}, + {file = "lxml-4.9.3-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:6fc3c450eaa0b56f815c7b62f2b7fba7266c4779adcf1cece9e6deb1de7305ce"}, + {file = "lxml-4.9.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:65299ea57d82fb91c7f019300d24050c4ddeb7c5a190e076b5f48a2b43d19c42"}, + {file = "lxml-4.9.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:eadfbbbfb41b44034a4c757fd5d70baccd43296fb894dba0295606a7cf3124aa"}, + {file = "lxml-4.9.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:3e9bdd30efde2b9ccfa9cb5768ba04fe71b018a25ea093379c857c9dad262c40"}, + {file = "lxml-4.9.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fcdd00edfd0a3001e0181eab3e63bd5c74ad3e67152c84f93f13769a40e073a7"}, + {file = "lxml-4.9.3-cp38-cp38-win32.whl", hash = "sha256:57aba1bbdf450b726d58b2aea5fe47c7875f5afb2c4a23784ed78f19a0462574"}, + {file = "lxml-4.9.3-cp38-cp38-win_amd64.whl", hash = "sha256:92af161ecbdb2883c4593d5ed4815ea71b31fafd7fd05789b23100d081ecac96"}, + {file = "lxml-4.9.3-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:9bb6ad405121241e99a86efff22d3ef469024ce22875a7ae045896ad23ba2340"}, + {file = "lxml-4.9.3-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:8ed74706b26ad100433da4b9d807eae371efaa266ffc3e9191ea436087a9d6a7"}, + {file = "lxml-4.9.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:fbf521479bcac1e25a663df882c46a641a9bff6b56dc8b0fafaebd2f66fb231b"}, + {file = "lxml-4.9.3-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:303bf1edce6ced16bf67a18a1cf8339d0db79577eec5d9a6d4a80f0fb10aa2da"}, + {file = "lxml-4.9.3-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:5515edd2a6d1a5a70bfcdee23b42ec33425e405c5b351478ab7dc9347228f96e"}, + {file = "lxml-4.9.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:690dafd0b187ed38583a648076865d8c229661ed20e48f2335d68e2cf7dc829d"}, + {file = "lxml-4.9.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b6420a005548ad52154c8ceab4a1290ff78d757f9e5cbc68f8c77089acd3c432"}, + {file = "lxml-4.9.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:bb3bb49c7a6ad9d981d734ef7c7193bc349ac338776a0360cc671eaee89bcf69"}, + {file = "lxml-4.9.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d27be7405547d1f958b60837dc4c1007da90b8b23f54ba1f8b728c78fdb19d50"}, + {file = "lxml-4.9.3-cp39-cp39-win32.whl", hash = "sha256:8df133a2ea5e74eef5e8fc6f19b9e085f758768a16e9877a60aec455ed2609b2"}, + {file = "lxml-4.9.3-cp39-cp39-win_amd64.whl", hash = "sha256:4dd9a263e845a72eacb60d12401e37c616438ea2e5442885f65082c276dfb2b2"}, + {file = "lxml-4.9.3-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:6689a3d7fd13dc687e9102a27e98ef33730ac4fe37795d5036d18b4d527abd35"}, + {file = "lxml-4.9.3-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:f6bdac493b949141b733c5345b6ba8f87a226029cbabc7e9e121a413e49441e0"}, + {file = "lxml-4.9.3-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:05186a0f1346ae12553d66df1cfce6f251589fea3ad3da4f3ef4e34b2d58c6a3"}, + {file = "lxml-4.9.3-pp37-pypy37_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:c2006f5c8d28dee289f7020f721354362fa304acbaaf9745751ac4006650254b"}, + {file = "lxml-4.9.3-pp38-pypy38_pp73-macosx_11_0_x86_64.whl", hash = "sha256:5c245b783db29c4e4fbbbfc9c5a78be496c9fea25517f90606aa1f6b2b3d5f7b"}, + {file = "lxml-4.9.3-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:4fb960a632a49f2f089d522f70496640fdf1218f1243889da3822e0a9f5f3ba7"}, + {file = "lxml-4.9.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:50670615eaf97227d5dc60de2dc99fb134a7130d310d783314e7724bf163f75d"}, + {file = "lxml-4.9.3-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:9719fe17307a9e814580af1f5c6e05ca593b12fb7e44fe62450a5384dbf61b4b"}, + {file = "lxml-4.9.3-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:3331bece23c9ee066e0fb3f96c61322b9e0f54d775fccefff4c38ca488de283a"}, + {file = "lxml-4.9.3-pp39-pypy39_pp73-macosx_11_0_x86_64.whl", hash = "sha256:ed667f49b11360951e201453fc3967344d0d0263aa415e1619e85ae7fd17b4e0"}, + {file = "lxml-4.9.3-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:8b77946fd508cbf0fccd8e400a7f71d4ac0e1595812e66025bac475a8e811694"}, + {file = "lxml-4.9.3-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:e4da8ca0c0c0aea88fd46be8e44bd49716772358d648cce45fe387f7b92374a7"}, + {file = "lxml-4.9.3-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:fe4bda6bd4340caa6e5cf95e73f8fea5c4bfc55763dd42f1b50a94c1b4a2fbd4"}, + {file = "lxml-4.9.3-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:f3df3db1d336b9356dd3112eae5f5c2b8b377f3bc826848567f10bfddfee77e9"}, + {file = "lxml-4.9.3.tar.gz", hash = "sha256:48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c"}, ] [package.extras] cssselect = ["cssselect (>=0.7)"] html5 = ["html5lib"] htmlsoup = ["BeautifulSoup4"] -source = ["Cython (>=0.29.7)"] +source = ["Cython (>=0.29.35)"] [[package]] name = "m2r2" @@ -2208,30 +2025,6 @@ files = [ docutils = ">=0.19" mistune = "0.8.4" -[[package]] -name = "markdown-it-py" -version = "3.0.0" -description = "Python port of markdown-it. Markdown parsing, done right!" -optional = false -python-versions = ">=3.8" -files = [ - {file = "markdown-it-py-3.0.0.tar.gz", hash = "sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb"}, - {file = "markdown_it_py-3.0.0-py3-none-any.whl", hash = "sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1"}, -] - -[package.dependencies] -mdurl = ">=0.1,<1.0" - -[package.extras] -benchmarking = ["psutil", "pytest", "pytest-benchmark"] -code-style = ["pre-commit (>=3.0,<4.0)"] -compare = ["commonmark (>=0.9,<1.0)", "markdown (>=3.4,<4.0)", "mistletoe (>=1.0,<2.0)", "mistune (>=2.0,<3.0)", "panflute (>=2.3,<3.0)"] -linkify = ["linkify-it-py (>=1,<3)"] -plugins = ["mdit-py-plugins"] -profiling = ["gprof2dot"] -rtd = ["jupyter_sphinx", "mdit-py-plugins", "myst-parser", "pyyaml", "sphinx", "sphinx-copybutton", "sphinx-design", "sphinx_book_theme"] -testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] - [[package]] name = "markupsafe" version = "2.1.3" @@ -2307,24 +2100,13 @@ traitlets = "*" [[package]] name = "mccabe" -version = "0.6.1" +version = "0.7.0" description = "McCabe checker, plugin for flake8" optional = false -python-versions = "*" -files = [ - {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"}, - {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"}, -] - -[[package]] -name = "mdurl" -version = "0.1.2" -description = "Markdown URL utilities" -optional = false -python-versions = ">=3.7" +python-versions = ">=3.6" files = [ - {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"}, - {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"}, + {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"}, + {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"}, ] [[package]] @@ -2561,36 +2343,36 @@ files = [ [[package]] name = "pandas" -version = "2.0.2" +version = "2.0.3" description = "Powerful data structures for data analysis, time series, and statistics" optional = false python-versions = ">=3.8" files = [ - {file = "pandas-2.0.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9ebb9f1c22ddb828e7fd017ea265a59d80461d5a79154b49a4207bd17514d122"}, - {file = "pandas-2.0.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:1eb09a242184092f424b2edd06eb2b99d06dc07eeddff9929e8667d4ed44e181"}, - {file = "pandas-2.0.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c7319b6e68de14e6209460f72a8d1ef13c09fb3d3ef6c37c1e65b35d50b5c145"}, - {file = "pandas-2.0.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd46bde7309088481b1cf9c58e3f0e204b9ff9e3244f441accd220dd3365ce7c"}, - {file = "pandas-2.0.2-cp310-cp310-win32.whl", hash = "sha256:51a93d422fbb1bd04b67639ba4b5368dffc26923f3ea32a275d2cc450f1d1c86"}, - {file = "pandas-2.0.2-cp310-cp310-win_amd64.whl", hash = "sha256:66d00300f188fa5de73f92d5725ced162488f6dc6ad4cecfe4144ca29debe3b8"}, - {file = "pandas-2.0.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:02755de164da6827764ceb3bbc5f64b35cb12394b1024fdf88704d0fa06e0e2f"}, - {file = "pandas-2.0.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0a1e0576611641acde15c2322228d138258f236d14b749ad9af498ab69089e2d"}, - {file = "pandas-2.0.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a6b5f14cd24a2ed06e14255ff40fe2ea0cfaef79a8dd68069b7ace74bd6acbba"}, - {file = "pandas-2.0.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:50e451932b3011b61d2961b4185382c92cc8c6ee4658dcd4f320687bb2d000ee"}, - {file = "pandas-2.0.2-cp311-cp311-win32.whl", hash = "sha256:7b21cb72958fc49ad757685db1919021d99650d7aaba676576c9e88d3889d456"}, - {file = "pandas-2.0.2-cp311-cp311-win_amd64.whl", hash = "sha256:c4af689352c4fe3d75b2834933ee9d0ccdbf5d7a8a7264f0ce9524e877820c08"}, - {file = "pandas-2.0.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:69167693cb8f9b3fc060956a5d0a0a8dbfed5f980d9fd2c306fb5b9c855c814c"}, - {file = "pandas-2.0.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:30a89d0fec4263ccbf96f68592fd668939481854d2ff9da709d32a047689393b"}, - {file = "pandas-2.0.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a18e5c72b989ff0f7197707ceddc99828320d0ca22ab50dd1b9e37db45b010c0"}, - {file = "pandas-2.0.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7376e13d28eb16752c398ca1d36ccfe52bf7e887067af9a0474de6331dd948d2"}, - {file = "pandas-2.0.2-cp38-cp38-win32.whl", hash = "sha256:6d6d10c2142d11d40d6e6c0a190b1f89f525bcf85564707e31b0a39e3b398e08"}, - {file = "pandas-2.0.2-cp38-cp38-win_amd64.whl", hash = "sha256:e69140bc2d29a8556f55445c15f5794490852af3de0f609a24003ef174528b79"}, - {file = "pandas-2.0.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b42b120458636a981077cfcfa8568c031b3e8709701315e2bfa866324a83efa8"}, - {file = "pandas-2.0.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f908a77cbeef9bbd646bd4b81214cbef9ac3dda4181d5092a4aa9797d1bc7774"}, - {file = "pandas-2.0.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:713f2f70abcdade1ddd68fc91577cb090b3544b07ceba78a12f799355a13ee44"}, - {file = "pandas-2.0.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cf3f0c361a4270185baa89ec7ab92ecaa355fe783791457077473f974f654df5"}, - {file = "pandas-2.0.2-cp39-cp39-win32.whl", hash = "sha256:598e9020d85a8cdbaa1815eb325a91cfff2bb2b23c1442549b8a3668e36f0f77"}, - {file = "pandas-2.0.2-cp39-cp39-win_amd64.whl", hash = "sha256:77550c8909ebc23e56a89f91b40ad01b50c42cfbfab49b3393694a50549295ea"}, - {file = "pandas-2.0.2.tar.gz", hash = "sha256:dd5476b6c3fe410ee95926873f377b856dbc4e81a9c605a0dc05aaccc6a7c6c6"}, + {file = "pandas-2.0.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e4c7c9f27a4185304c7caf96dc7d91bc60bc162221152de697c98eb0b2648dd8"}, + {file = "pandas-2.0.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:f167beed68918d62bffb6ec64f2e1d8a7d297a038f86d4aed056b9493fca407f"}, + {file = "pandas-2.0.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ce0c6f76a0f1ba361551f3e6dceaff06bde7514a374aa43e33b588ec10420183"}, + {file = "pandas-2.0.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba619e410a21d8c387a1ea6e8a0e49bb42216474436245718d7f2e88a2f8d7c0"}, + {file = "pandas-2.0.3-cp310-cp310-win32.whl", hash = "sha256:3ef285093b4fe5058eefd756100a367f27029913760773c8bf1d2d8bebe5d210"}, + {file = "pandas-2.0.3-cp310-cp310-win_amd64.whl", hash = "sha256:9ee1a69328d5c36c98d8e74db06f4ad518a1840e8ccb94a4ba86920986bb617e"}, + {file = "pandas-2.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b084b91d8d66ab19f5bb3256cbd5ea661848338301940e17f4492b2ce0801fe8"}, + {file = "pandas-2.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:37673e3bdf1551b95bf5d4ce372b37770f9529743d2498032439371fc7b7eb26"}, + {file = "pandas-2.0.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9cb1e14fdb546396b7e1b923ffaeeac24e4cedd14266c3497216dd4448e4f2d"}, + {file = "pandas-2.0.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d9cd88488cceb7635aebb84809d087468eb33551097d600c6dad13602029c2df"}, + {file = "pandas-2.0.3-cp311-cp311-win32.whl", hash = "sha256:694888a81198786f0e164ee3a581df7d505024fbb1f15202fc7db88a71d84ebd"}, + {file = "pandas-2.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:6a21ab5c89dcbd57f78d0ae16630b090eec626360085a4148693def5452d8a6b"}, + {file = "pandas-2.0.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9e4da0d45e7f34c069fe4d522359df7d23badf83abc1d1cef398895822d11061"}, + {file = "pandas-2.0.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:32fca2ee1b0d93dd71d979726b12b61faa06aeb93cf77468776287f41ff8fdc5"}, + {file = "pandas-2.0.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:258d3624b3ae734490e4d63c430256e716f488c4fcb7c8e9bde2d3aa46c29089"}, + {file = "pandas-2.0.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9eae3dc34fa1aa7772dd3fc60270d13ced7346fcbcfee017d3132ec625e23bb0"}, + {file = "pandas-2.0.3-cp38-cp38-win32.whl", hash = "sha256:f3421a7afb1a43f7e38e82e844e2bca9a6d793d66c1a7f9f0ff39a795bbc5e02"}, + {file = "pandas-2.0.3-cp38-cp38-win_amd64.whl", hash = "sha256:69d7f3884c95da3a31ef82b7618af5710dba95bb885ffab339aad925c3e8ce78"}, + {file = "pandas-2.0.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5247fb1ba347c1261cbbf0fcfba4a3121fbb4029d95d9ef4dc45406620b25c8b"}, + {file = "pandas-2.0.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:81af086f4543c9d8bb128328b5d32e9986e0c84d3ee673a2ac6fb57fd14f755e"}, + {file = "pandas-2.0.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1994c789bf12a7c5098277fb43836ce090f1073858c10f9220998ac74f37c69b"}, + {file = "pandas-2.0.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5ec591c48e29226bcbb316e0c1e9423622bc7a4eaf1ef7c3c9fa1a3981f89641"}, + {file = "pandas-2.0.3-cp39-cp39-win32.whl", hash = "sha256:04dbdbaf2e4d46ca8da896e1805bc04eb85caa9a82e259e8eed00254d5e0c682"}, + {file = "pandas-2.0.3-cp39-cp39-win_amd64.whl", hash = "sha256:1168574b036cd8b93abc746171c9b4f1b83467438a5e45909fed645cf8692dbc"}, + {file = "pandas-2.0.3.tar.gz", hash = "sha256:c02f372a88e0d17f36d3093a644c73cfc1788e876a7c4bcb4020a77512e2043c"}, ] [package.dependencies] @@ -2604,7 +2386,7 @@ pytz = ">=2020.1" tzdata = ">=2022.1" [package.extras] -all = ["PyQt5 (>=5.15.1)", "SQLAlchemy (>=1.4.16)", "beautifulsoup4 (>=4.9.3)", "bottleneck (>=1.3.2)", "brotlipy (>=0.7.0)", "fastparquet (>=0.6.3)", "fsspec (>=2021.07.0)", "gcsfs (>=2021.07.0)", "html5lib (>=1.1)", "hypothesis (>=6.34.2)", "jinja2 (>=3.0.0)", "lxml (>=4.6.3)", "matplotlib (>=3.6.1)", "numba (>=0.53.1)", "numexpr (>=2.7.3)", "odfpy (>=1.4.1)", "openpyxl (>=3.0.7)", "pandas-gbq (>=0.15.0)", "psycopg2 (>=2.8.6)", "pyarrow (>=7.0.0)", "pymysql (>=1.0.2)", "pyreadstat (>=1.1.2)", "pytest (>=7.0.0)", "pytest-asyncio (>=0.17.0)", "pytest-xdist (>=2.2.0)", "python-snappy (>=0.6.0)", "pyxlsb (>=1.0.8)", "qtpy (>=2.2.0)", "s3fs (>=2021.08.0)", "scipy (>=1.7.1)", "tables (>=3.6.1)", "tabulate (>=0.8.9)", "xarray (>=0.21.0)", "xlrd (>=2.0.1)", "xlsxwriter (>=1.4.3)", "zstandard (>=0.15.2)"] +all = ["PyQt5 (>=5.15.1)", "SQLAlchemy (>=1.4.16)", "beautifulsoup4 (>=4.9.3)", "bottleneck (>=1.3.2)", "brotlipy (>=0.7.0)", "fastparquet (>=0.6.3)", "fsspec (>=2021.07.0)", "gcsfs (>=2021.07.0)", "html5lib (>=1.1)", "hypothesis (>=6.34.2)", "jinja2 (>=3.0.0)", "lxml (>=4.6.3)", "matplotlib (>=3.6.1)", "numba (>=0.53.1)", "numexpr (>=2.7.3)", "odfpy (>=1.4.1)", "openpyxl (>=3.0.7)", "pandas-gbq (>=0.15.0)", "psycopg2 (>=2.8.6)", "pyarrow (>=7.0.0)", "pymysql (>=1.0.2)", "pyreadstat (>=1.1.2)", "pytest (>=7.3.2)", "pytest-asyncio (>=0.17.0)", "pytest-xdist (>=2.2.0)", "python-snappy (>=0.6.0)", "pyxlsb (>=1.0.8)", "qtpy (>=2.2.0)", "s3fs (>=2021.08.0)", "scipy (>=1.7.1)", "tables (>=3.6.1)", "tabulate (>=0.8.9)", "xarray (>=0.21.0)", "xlrd (>=2.0.1)", "xlsxwriter (>=1.4.3)", "zstandard (>=0.15.2)"] aws = ["s3fs (>=2021.08.0)"] clipboard = ["PyQt5 (>=5.15.1)", "qtpy (>=2.2.0)"] compression = ["brotlipy (>=0.7.0)", "python-snappy (>=0.6.0)", "zstandard (>=0.15.2)"] @@ -2623,7 +2405,7 @@ plot = ["matplotlib (>=3.6.1)"] postgresql = ["SQLAlchemy (>=1.4.16)", "psycopg2 (>=2.8.6)"] spss = ["pyreadstat (>=1.1.2)"] sql-other = ["SQLAlchemy (>=1.4.16)"] -test = ["hypothesis (>=6.34.2)", "pytest (>=7.0.0)", "pytest-asyncio (>=0.17.0)", "pytest-xdist (>=2.2.0)"] +test = ["hypothesis (>=6.34.2)", "pytest (>=7.3.2)", "pytest-asyncio (>=0.17.0)", "pytest-xdist (>=2.2.0)"] xml = ["lxml (>=4.6.3)"] [[package]] @@ -2673,17 +2455,6 @@ files = [ {file = "pathspec-0.11.1.tar.gz", hash = "sha256:2798de800fa92780e33acca925945e9a19a133b715067cf165b8866c15a31687"}, ] -[[package]] -name = "pbr" -version = "5.11.1" -description = "Python Build Reasonableness" -optional = false -python-versions = ">=2.6" -files = [ - {file = "pbr-5.11.1-py2.py3-none-any.whl", hash = "sha256:567f09558bae2b3ab53cb3c1e2e33e726ff3338e7bae3db5dc954b3a44eef12b"}, - {file = "pbr-5.11.1.tar.gz", hash = "sha256:aefc51675b0b533d56bb5fd1c8c6c0522fe31896679882e1c4c63d5e4a0fccb3"}, -] - [[package]] name = "pexpect" version = "4.8.0" @@ -2711,13 +2482,13 @@ files = [ [[package]] name = "platformdirs" -version = "3.6.0" +version = "3.8.1" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." optional = false python-versions = ">=3.7" files = [ - {file = "platformdirs-3.6.0-py3-none-any.whl", hash = "sha256:ffa199e3fbab8365778c4a10e1fbf1b9cd50707de826eb304b50e57ec0cc8d38"}, - {file = "platformdirs-3.6.0.tar.gz", hash = "sha256:57e28820ca8094678b807ff529196506d7a21e17156cb1cddb3e74cebce54640"}, + {file = "platformdirs-3.8.1-py3-none-any.whl", hash = "sha256:cec7b889196b9144d088e4c57d9ceef7374f6c39694ad1577a0aab50d27ea28c"}, + {file = "platformdirs-3.8.1.tar.gz", hash = "sha256:f87ca4fcff7d2b0f81c6a748a77973d7af0f4d526f98f308477c3c436c74d528"}, ] [package.extras] @@ -2726,13 +2497,13 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.3.1)", "pytest- [[package]] name = "pluggy" -version = "1.0.0" +version = "1.2.0" description = "plugin and hook calling mechanisms for python" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" files = [ - {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, - {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, + {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"}, + {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"}, ] [package.extras] @@ -2770,13 +2541,13 @@ virtualenv = ">=20.10.0" [[package]] name = "prompt-toolkit" -version = "3.0.38" +version = "3.0.39" description = "Library for building powerful interactive command lines in Python" optional = false python-versions = ">=3.7.0" files = [ - {file = "prompt_toolkit-3.0.38-py3-none-any.whl", hash = "sha256:45ea77a2f7c60418850331366c81cf6b5b9cf4c7fd34616f733c5427e6abbb1f"}, - {file = "prompt_toolkit-3.0.38.tar.gz", hash = "sha256:23ac5d50538a9a38c8bde05fecb47d0b403ecd0662857a86f886f798563d5b9b"}, + {file = "prompt_toolkit-3.0.39-py3-none-any.whl", hash = "sha256:9dffbe1d8acf91e3de75f3b544e4842382fc06c6babe903ac9acb74dc6e08d88"}, + {file = "prompt_toolkit-3.0.39.tar.gz", hash = "sha256:04505ade687dc26dc4284b1ad19a83be2f2afe83e7a828ace0c72f3a1df72aac"}, ] [package.dependencies] @@ -2831,13 +2602,13 @@ tests = ["pytest"] [[package]] name = "pycodestyle" -version = "2.7.0" +version = "2.9.1" description = "Python style guide checker" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6" files = [ - {file = "pycodestyle-2.7.0-py2.py3-none-any.whl", hash = "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068"}, - {file = "pycodestyle-2.7.0.tar.gz", hash = "sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef"}, + {file = "pycodestyle-2.9.1-py2.py3-none-any.whl", hash = "sha256:d1735fc58b418fd7c5f658d28d943854f8a849b01a5d0a1e6f3f3fdd0166804b"}, + {file = "pycodestyle-2.9.1.tar.gz", hash = "sha256:2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785"}, ] [[package]] @@ -2853,13 +2624,13 @@ files = [ [[package]] name = "pyflakes" -version = "2.3.1" +version = "2.5.0" description = "passive checker of Python programs" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6" files = [ - {file = "pyflakes-2.3.1-py2.py3-none-any.whl", hash = "sha256:7893783d01b8a89811dd72d7dfd4d84ff098e5eed95cfa8905b22bbffe52efc3"}, - {file = "pyflakes-2.3.1.tar.gz", hash = "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"}, + {file = "pyflakes-2.5.0-py2.py3-none-any.whl", hash = "sha256:4579f67d887f804e67edb544428f264b7b24f435b263c4614f384135cea553d2"}, + {file = "pyflakes-2.5.0.tar.gz", hash = "sha256:491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3"}, ] [[package]] @@ -3023,13 +2794,13 @@ six = ">=1.4" [[package]] name = "pytest" -version = "7.3.2" +version = "7.4.0" description = "pytest: simple powerful testing with Python" optional = false python-versions = ">=3.7" files = [ - {file = "pytest-7.3.2-py3-none-any.whl", hash = "sha256:cdcbd012c9312258922f8cd3f1b62a6580fdced17db6014896053d47cddf9295"}, - {file = "pytest-7.3.2.tar.gz", hash = "sha256:ee990a3cc55ba808b80795a79944756f315c67c12b56abd3ac993a7b8c17030b"}, + {file = "pytest-7.4.0-py3-none-any.whl", hash = "sha256:78bf16451a2eb8c7a2ea98e32dc119fd2aa758f1d5d66dbf0a59d69a3969df32"}, + {file = "pytest-7.4.0.tar.gz", hash = "sha256:b4bf8c45bd59934ed84001ad51e11b4ee40d40a1229d2c79f9c592b0a3f6bd8a"}, ] [package.dependencies] @@ -3227,13 +2998,13 @@ files = [ [[package]] name = "redis" -version = "4.5.5" +version = "4.6.0" description = "Python client for Redis database and key-value store" optional = false python-versions = ">=3.7" files = [ - {file = "redis-4.5.5-py3-none-any.whl", hash = "sha256:77929bc7f5dab9adf3acba2d3bb7d7658f1e0c2f1cafe7eb36434e751c471119"}, - {file = "redis-4.5.5.tar.gz", hash = "sha256:dc87a0bdef6c8bfe1ef1e1c40be7034390c2ae02d92dcd0c7ca1729443899880"}, + {file = "redis-4.6.0-py3-none-any.whl", hash = "sha256:e2b03db868160ee4591de3cb90d40ebb50a90dd302138775937f6a42b7ed183c"}, + {file = "redis-4.6.0.tar.gz", hash = "sha256:585dc516b9eb042a619ef0a39c3d7d55fe81bdb4df09a52c9cdde0d07bf1aa7d"}, ] [package.dependencies] @@ -3296,24 +3067,6 @@ files = [ [package.extras] idna2008 = ["idna"] -[[package]] -name = "rich" -version = "13.4.2" -description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" -optional = false -python-versions = ">=3.7.0" -files = [ - {file = "rich-13.4.2-py3-none-any.whl", hash = "sha256:8f87bc7ee54675732fa66a05ebfe489e27264caeeff3728c945d25971b6485ec"}, - {file = "rich-13.4.2.tar.gz", hash = "sha256:d653d6bccede5844304c605d5aac802c7cf9621efd700b46c7ec2b51ea914898"}, -] - -[package.dependencies] -markdown-it-py = ">=2.2.0" -pygments = ">=2.13.0,<3.0.0" - -[package.extras] -jupyter = ["ipywidgets (>=7.5.1,<9)"] - [[package]] name = "rjsmin" version = "1.1.0" @@ -3355,13 +3108,13 @@ crt = ["botocore[crt] (>=1.20.29,<2.0a.0)"] [[package]] name = "sentry-sdk" -version = "1.25.1" +version = "1.28.1" description = "Python client for Sentry (https://sentry.io)" optional = false python-versions = "*" files = [ - {file = "sentry-sdk-1.25.1.tar.gz", hash = "sha256:aa796423eb6a2f4a8cd7a5b02ba6558cb10aab4ccdc0537f63a47b038c520c38"}, - {file = "sentry_sdk-1.25.1-py2.py3-none-any.whl", hash = "sha256:79afb7c896014038e358401ad1d36889f97a129dfa8031c49b3f238cd1aa3935"}, + {file = "sentry-sdk-1.28.1.tar.gz", hash = "sha256:dcd88c68aa64dae715311b5ede6502fd684f70d00a7cd4858118f0ba3153a3ae"}, + {file = "sentry_sdk-1.28.1-py2.py3-none-any.whl", hash = "sha256:6bdb25bd9092478d3a817cb0d01fa99e296aea34d404eac3ca0037faa5c2aa0a"}, ] [package.dependencies] @@ -3422,17 +3175,6 @@ files = [ {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, ] -[[package]] -name = "smmap" -version = "5.0.0" -description = "A pure Python implementation of a sliding window memory map manager" -optional = false -python-versions = ">=3.6" -files = [ - {file = "smmap-5.0.0-py3-none-any.whl", hash = "sha256:2aba19d6a040e78d8b09de5c57e96207b09ed71d8e55ce0959eeee6c8e190d94"}, - {file = "smmap-5.0.0.tar.gz", hash = "sha256:c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936"}, -] - [[package]] name = "snowballstemmer" version = "2.2.0" @@ -3602,52 +3344,52 @@ test = ["pytest"] [[package]] name = "sqlalchemy" -version = "2.0.16" +version = "2.0.18" description = "Database Abstraction Library" optional = false python-versions = ">=3.7" files = [ - {file = "SQLAlchemy-2.0.16-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7641f6ed2682de84d77c4894cf2e43700f3cf7a729361d7f9cac98febf3d8614"}, - {file = "SQLAlchemy-2.0.16-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8d3cbdb2f07fb0e4b897dc1df39166735e194fb946f28f26f4c9f9801c8b24f7"}, - {file = "SQLAlchemy-2.0.16-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08a791c75d6154d46914d1e23bd81d9455f2950ec1de81f2723848c593d2c8b"}, - {file = "SQLAlchemy-2.0.16-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:91eb8f89fcce8f709f8a4d65d265bc48a80264ee14c7c9e955f3222f19b4b39c"}, - {file = "SQLAlchemy-2.0.16-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:fc1dae11bd5167f9eb53b3ccad24a79813004612141e76de21cf4c028dc30b34"}, - {file = "SQLAlchemy-2.0.16-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b2801f85c5c0293aa710f8aa5262c707a83c1c203962ae5a22b4d9095e71aa9d"}, - {file = "SQLAlchemy-2.0.16-cp310-cp310-win32.whl", hash = "sha256:c5e333b81fe10d14efebd4e9429b7bb865ed9463ca8bef07a7136dfa1fd4a37b"}, - {file = "SQLAlchemy-2.0.16-cp310-cp310-win_amd64.whl", hash = "sha256:f387b496a4c9474d8580195bb2660264a3f295a04d3a9d00f4fa15e9e597427e"}, - {file = "SQLAlchemy-2.0.16-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:7be04dbe3470fe8dd332fdb48c979887c381ef6c635eddf2dec43d2766111be4"}, - {file = "SQLAlchemy-2.0.16-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f2938edc512dd1fa48653e14c1655ab46144d4450f0e6b33da7acd8ba77fbfd7"}, - {file = "SQLAlchemy-2.0.16-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5a2856e12cf5f54301ddf043bcbf0552561d61555e1bcf348b63f42b8e1eec2"}, - {file = "SQLAlchemy-2.0.16-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90d320fde566b864adbc19abb40ecb80f4e25d6f084639969bb972d5cca16858"}, - {file = "SQLAlchemy-2.0.16-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:6e85e315725807c127ad8ba3d628fdb861cf9ebfb0e10c39a97c01e257cdd71b"}, - {file = "SQLAlchemy-2.0.16-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:63ea36c08792a7a8a08958bc806ecff6b491386feeaf14607c3d9d2d9325e67f"}, - {file = "SQLAlchemy-2.0.16-cp311-cp311-win32.whl", hash = "sha256:bdaf89dd82f4a0e1b8b5ffc9cdc0c9551be6175f7eee5af6a838e92ba2e57100"}, - {file = "SQLAlchemy-2.0.16-cp311-cp311-win_amd64.whl", hash = "sha256:5a934eff1a2882137be3384826f997db8441d43b61fda3094923e69fffe474be"}, - {file = "SQLAlchemy-2.0.16-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fbcc51fdbc89fafe4f4fe66f59372a8be88ded04de34ef438ab04f980beb12d4"}, - {file = "SQLAlchemy-2.0.16-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ff6496ad5e9dc8baeb93a151cc2f599d01e5f8928a2aaf0b09a06428fdbaf553"}, - {file = "SQLAlchemy-2.0.16-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d6ef848e5afcd1bda3e9a843751f845c0ca888b61e669237680e913d84ec206"}, - {file = "SQLAlchemy-2.0.16-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:3ef876615ff4b53e2033022195830ec4941a6e21068611f8d77de60203b90a98"}, - {file = "SQLAlchemy-2.0.16-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8544c6e62eacb77d5106e2055ef10f2407fc0dbd547e879f8745b2032eefd2bc"}, - {file = "SQLAlchemy-2.0.16-cp37-cp37m-win32.whl", hash = "sha256:2f3b6c31b915159b96b68372212fa77f69230b0a32acab40cf539d2823954f5a"}, - {file = "SQLAlchemy-2.0.16-cp37-cp37m-win_amd64.whl", hash = "sha256:d0c96592f54edd571e00ba6b1ed5df8263328ca1da9e78088c0ebc93c2e6562c"}, - {file = "SQLAlchemy-2.0.16-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a2e9f50a906d0b81292576a9fb458f8cace904c81a67088f4a2ca9ff2856f55d"}, - {file = "SQLAlchemy-2.0.16-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:dc97238fa44be86971270943a0c21c19ce18b8d1596919048e57912e8abc02cc"}, - {file = "SQLAlchemy-2.0.16-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0db6734cb5644c55d0262a813b764c6e2cda1e66e939a488b3d6298cdc7344c2"}, - {file = "SQLAlchemy-2.0.16-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:131f0c894c6572cb1bdcf97c92d999d3128c4ff1ca13061296057072f61afe13"}, - {file = "SQLAlchemy-2.0.16-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f662cf69484c59f8a3435902c40dfc34d86050bdb15e23d437074ce9f153306b"}, - {file = "SQLAlchemy-2.0.16-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b72f4e4def50414164a1d899f2ce4e782a029fad0ed5585981d1611e8ae29a74"}, - {file = "SQLAlchemy-2.0.16-cp38-cp38-win32.whl", hash = "sha256:0e4645b260cfe375a0603aa117f0a47680864cf37833129da870919e88b08d8f"}, - {file = "SQLAlchemy-2.0.16-cp38-cp38-win_amd64.whl", hash = "sha256:f409f35a0330ab0cb18ece736b86d8b8233c64f4461fcb10993f67afc0ac7e5a"}, - {file = "SQLAlchemy-2.0.16-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e19546924f0cf2ec930d1faf318b7365e5827276410a513340f31a2b423e96a4"}, - {file = "SQLAlchemy-2.0.16-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ce1fc3f64fd42d5f763d6b83651471f32920338a1ba107a3186211474861af57"}, - {file = "SQLAlchemy-2.0.16-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e2569dac4e3cb85365b91ab569d06a221e0e17e65ce59949d00c3958946282b"}, - {file = "SQLAlchemy-2.0.16-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:61f2035dea56ff1a429077e481496f813378beb02b823d2e3e7eb05bc1a7a8ca"}, - {file = "SQLAlchemy-2.0.16-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:81d867c1be5abd49f7e547c108391f371a9d980ba7ec34666c50d683f782b754"}, - {file = "SQLAlchemy-2.0.16-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:2de1477af7f48c633b8ecb88245aedd811dca88e88aee9e9d787b388abe74c44"}, - {file = "SQLAlchemy-2.0.16-cp39-cp39-win32.whl", hash = "sha256:5e8522b49e0e640287308b68f71cc338446bbe1c226c8f81743baa91b0246e92"}, - {file = "SQLAlchemy-2.0.16-cp39-cp39-win_amd64.whl", hash = "sha256:43e69c8c1cea0188b7094e22fb93ae1a1890aac748628b7e925024a206f75368"}, - {file = "SQLAlchemy-2.0.16-py3-none-any.whl", hash = "sha256:53081c6fce0d49bb36d05f12dc87e008c9b0df58a163b792c5fc4ac638925f98"}, - {file = "SQLAlchemy-2.0.16.tar.gz", hash = "sha256:1e2caba78e7d1f5003e88817b7a1754d4e58f4a8f956dc423bf8e304c568ab09"}, + {file = "SQLAlchemy-2.0.18-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7ddd6d35c598af872f9a0a5bce7f7c4a1841684a72dab3302e3df7f17d1b5249"}, + {file = "SQLAlchemy-2.0.18-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:00aa050faf24ce5f2af643e2b86822fa1d7149649995f11bc1e769bbfbf9010b"}, + {file = "SQLAlchemy-2.0.18-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b52c6741073de5a744d27329f9803938dcad5c9fee7e61690c705f72973f4175"}, + {file = "SQLAlchemy-2.0.18-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7db97eabd440327c35b751d5ebf78a107f505586485159bcc87660da8bb1fdca"}, + {file = "SQLAlchemy-2.0.18-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:589aba9a35869695b319ed76c6f673d896cd01a7ff78054be1596df7ad9b096f"}, + {file = "SQLAlchemy-2.0.18-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9da4ee8f711e077633730955c8f3cd2485c9abf5ea0f80aac23221a3224b9a8c"}, + {file = "SQLAlchemy-2.0.18-cp310-cp310-win32.whl", hash = "sha256:5dd574a37be388512c72fe0d7318cb8e31743a9b2699847a025e0c08c5bf579d"}, + {file = "SQLAlchemy-2.0.18-cp310-cp310-win_amd64.whl", hash = "sha256:6852cd34d96835e4c9091c1e6087325efb5b607b75fd9f7075616197d1c4688a"}, + {file = "SQLAlchemy-2.0.18-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:10e001a84f820fea2640e4500e12322b03afc31d8f4f6b813b44813b2a7c7e0d"}, + {file = "SQLAlchemy-2.0.18-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:bffd6cd47c2e68970039c0d3e355c9ed761d3ca727b204e63cd294cad0e3df90"}, + {file = "SQLAlchemy-2.0.18-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b7b3ebfa9416c8eafaffa65216e229480c495e305a06ba176dcac32710744e6"}, + {file = "SQLAlchemy-2.0.18-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:79228a7b90d95957354f37b9d46f2cc8926262ae17b0d3ed8f36c892f2a37e06"}, + {file = "SQLAlchemy-2.0.18-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ba633b51835036ff0f402c21f3ff567c565a22ff0a5732b060a68f4660e2a38f"}, + {file = "SQLAlchemy-2.0.18-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:8da677135eff43502b7afab5a1e641edfb2dc734ba7fc146e9b1b86817a728e2"}, + {file = "SQLAlchemy-2.0.18-cp311-cp311-win32.whl", hash = "sha256:82edf3a6090554a83942cec79151d6b5eb96e63d143e80e4cf6671e5d772f6be"}, + {file = "SQLAlchemy-2.0.18-cp311-cp311-win_amd64.whl", hash = "sha256:69ae0e9509c43474e33152abe1385b8954922544616426bf793481e1a37e094f"}, + {file = "SQLAlchemy-2.0.18-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:09397a18733fa2a4c7680b746094f980060666ee549deafdb5e102a99ce4619b"}, + {file = "SQLAlchemy-2.0.18-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:45b07470571bda5ee7f5ec471271bbde97267cc8403fce05e280c36ea73f4754"}, + {file = "SQLAlchemy-2.0.18-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1aac42a21a7fa6c9665392c840b295962992ddf40aecf0a88073bc5c76728117"}, + {file = "SQLAlchemy-2.0.18-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:da46beef0ce882546d92b7b2e8deb9e04dbb8fec72945a8eb28b347ca46bc15a"}, + {file = "SQLAlchemy-2.0.18-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:a6f1d8256d06f58e6ece150fbe05c63c7f9510df99ee8ac37423f5476a2cebb4"}, + {file = "SQLAlchemy-2.0.18-cp37-cp37m-win32.whl", hash = "sha256:67fbb40db3985c0cfb942fe8853ad94a5e9702d2987dec03abadc2f3b6a24afb"}, + {file = "SQLAlchemy-2.0.18-cp37-cp37m-win_amd64.whl", hash = "sha256:afb322ca05e2603deedbcd2e9910f11a3fd2f42bdeafe63018e5641945c7491c"}, + {file = "SQLAlchemy-2.0.18-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:908c850b98cac1e203ababd4ba76868d19ae0d7172cdc75d3f1b7829b16837d2"}, + {file = "SQLAlchemy-2.0.18-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:10514adc41fc8f5922728fbac13d401a1aefcf037f009e64ca3b92464e33bf0e"}, + {file = "SQLAlchemy-2.0.18-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2b791577c546b6bbd7b43953565fcb0a2fec63643ad605353dd48afbc3c48317"}, + {file = "SQLAlchemy-2.0.18-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:420bc6d06d4ae7fb6921524334689eebcbea7bf2005efef070a8562cc9527a37"}, + {file = "SQLAlchemy-2.0.18-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ebdd2418ab4e2e26d572d9a1c03877f8514a9b7436729525aa571862507b3fea"}, + {file = "SQLAlchemy-2.0.18-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:556dc18e39b6edb76239acfd1c010e37395a54c7fde8c57481c15819a3ffb13e"}, + {file = "SQLAlchemy-2.0.18-cp38-cp38-win32.whl", hash = "sha256:7b8cba5a25e95041e3413d91f9e50616bcfaec95afa038ce7dc02efefe576745"}, + {file = "SQLAlchemy-2.0.18-cp38-cp38-win_amd64.whl", hash = "sha256:0f7fdcce52cd882b559a57b484efc92e108efeeee89fab6b623aba1ac68aad2e"}, + {file = "SQLAlchemy-2.0.18-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d7a2c1e711ce59ac9d0bba780318bcd102d2958bb423209f24c6354d8c4da930"}, + {file = "SQLAlchemy-2.0.18-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:5c95e3e7cc6285bf7ff263eabb0d3bfe3def9a1ff98124083d45e5ece72f4579"}, + {file = "SQLAlchemy-2.0.18-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fc44e50f9d5e96af1a561faa36863f9191f27364a4df3eb70bca66e9370480b6"}, + {file = "SQLAlchemy-2.0.18-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bfa1a0f83bdf8061db8d17c2029454722043f1e4dd1b3d3d3120d1b54e75825a"}, + {file = "SQLAlchemy-2.0.18-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:194f2d5a7cb3739875c4d25b3fe288ab0b3dc33f7c857ba2845830c8c51170a0"}, + {file = "SQLAlchemy-2.0.18-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4ebc542d2289c0b016d6945fd07a7e2e23f4abc41e731ac8ad18a9e0c2fd0ec2"}, + {file = "SQLAlchemy-2.0.18-cp39-cp39-win32.whl", hash = "sha256:774bd401e7993452ba0596e741c0c4d6d22f882dd2a798993859181dbffadc62"}, + {file = "SQLAlchemy-2.0.18-cp39-cp39-win_amd64.whl", hash = "sha256:2756485f49e7df5c2208bdc64263d19d23eba70666f14ad12d6d8278a2fff65f"}, + {file = "SQLAlchemy-2.0.18-py3-none-any.whl", hash = "sha256:6c5bae4c288bda92a7550fe8de9e068c0a7cd56b1c5d888aae5b40f0e13b40bd"}, + {file = "SQLAlchemy-2.0.18.tar.gz", hash = "sha256:1fb792051db66e09c200e7bc3bda3b1eb18a5b8eb153d2cedb2b14b56a68b8cb"}, ] [package.dependencies] @@ -3713,20 +3455,6 @@ pure-eval = "*" [package.extras] tests = ["cython", "littleutils", "pygments", "pytest", "typeguard"] -[[package]] -name = "stevedore" -version = "5.1.0" -description = "Manage dynamic plugins for Python applications" -optional = false -python-versions = ">=3.8" -files = [ - {file = "stevedore-5.1.0-py3-none-any.whl", hash = "sha256:8cc040628f3cea5d7128f2e76cf486b2251a4e543c7b938f58d9a377f6694a2d"}, - {file = "stevedore-5.1.0.tar.gz", hash = "sha256:a54534acf9b89bc7ed264807013b505bf07f74dbe4bcfa37d32bd063870b087c"}, -] - -[package.dependencies] -pbr = ">=2.0.0,<2.1.0 || >2.1.0" - [[package]] name = "tableschema" version = "1.7.4" @@ -3859,13 +3587,13 @@ test = ["argcomplete (>=2.0)", "pre-commit", "pytest", "pytest-mock"] [[package]] name = "typing-extensions" -version = "4.6.3" +version = "4.7.1" description = "Backported and Experimental Type Hints for Python 3.7+" optional = false python-versions = ">=3.7" files = [ - {file = "typing_extensions-4.6.3-py3-none-any.whl", hash = "sha256:88a4153d8505aabbb4e13aacb7c486c2b4a33ca3b3f807914a9b4c844c471c26"}, - {file = "typing_extensions-4.6.3.tar.gz", hash = "sha256:d91d5919357fe7f681a9f2b5b4cb2a5f1ef0a1e9f59c4d8ff0d3491e05c0ffd5"}, + {file = "typing_extensions-4.7.1-py3-none-any.whl", hash = "sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36"}, + {file = "typing_extensions-4.7.1.tar.gz", hash = "sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2"}, ] [[package]] @@ -4102,20 +3830,20 @@ test = ["pytest", "pytest-cov"] [[package]] name = "zipp" -version = "3.15.0" +version = "3.16.1" description = "Backport of pathlib-compatible object wrapper for zip files" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "zipp-3.15.0-py3-none-any.whl", hash = "sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556"}, - {file = "zipp-3.15.0.tar.gz", hash = "sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b"}, + {file = "zipp-3.16.1-py3-none-any.whl", hash = "sha256:0b37c326d826d5ca35f2b9685cd750292740774ef16190008b00a0227c256fe0"}, + {file = "zipp-3.16.1.tar.gz", hash = "sha256:857b158da2cbf427b376da1c24fd11faecbac5a4ac7523c3607f8a01f94c2ec0"}, ] [package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-ruff"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "9ec7af081822fef1082b1f919ebdeac2951766ad9c343e14fa9af0e9ab912b6b" +content-hash = "7ea5d45d3d19f51c92ef8fbce226531e4d38e22a5ae17c8ac128579ef1a24f45" diff --git a/pyproject.toml b/pyproject.toml index 44164bb6..f33d1653 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "digiplan" -version = "0.4.0" +version = "0.5.0" description = "Digiplan" authors = [ "Hendrik Huyskens ", @@ -25,7 +25,7 @@ sentry-sdk = "^1.17.0" # Django # ------------------------------------------------------------------------------ -django = "^3.2.3" # pyup: < 3.0 # https://www.djangoproject.com/ +django = "^3.2.20" # pyup: < 3.0 # https://www.djangoproject.com/ django-environ = "^0.10.0" # https://github.com/joke2k/django-environ django-allauth = "^0.44.0" # https://github.com/pennersr/django-allauth django-foundation-formtags = "^0.1.0" @@ -61,17 +61,10 @@ pytest-sugar = "^0.9.4" # https://github.com/Frozenball/pytest-sugar # Code quality # ------------------------------------------------------------------------------ -flake8 = "^3.9.2" # https://github.com/PyCQA/flake8 +flake8 = "^5.0.4" # https://github.com/PyCQA/flake8 pylint-django = "^2.3.0" # https://github.com/PyCQA/pylint-django # downgraded because https://github.com/PyCQA/pylint-django/issues/309 pre-commit = "^2.13.0" # https://github.com/pre-commit/pre-commit -flake8-bandit = "^3.0.0" -flake8-bugbear = "^22.4.25" -flake8-builtins = "^1.5.3" -flake8-comprehensions = "^3.10.0" darglint = "^1.8.1" -flake8-eradicate = "^1.2.1" -flake8-isort = "^4.1.1" -flake8-pytest-style = "^1.6.0" black = "^21.12b0" # Django @@ -93,7 +86,16 @@ profile = "black" [tool.ruff] line-length = 120 select = ["ALL"] +exclude = [ + "manage.py", + "digiplan/utils/ogr_layer_mapping.py", + "config/wsgi.py", + "digiplan/contrib/*", + "merge_local_dotenvs_in_dotenv.py", + "digiplan/utils/context_processors.py" +] ignore = [ + "I001", # Import block is un-sorted or un-formatted (done by isort) "D203", # 1 blank line required before class docstring "D212", # Multi-line docstring summary should start at the first line pydocstyle "ANN101", # Missing type annotation for `self` in method @@ -107,12 +109,20 @@ ignore = [ "FIX001", # Line contains FIXME "FIX002", # Line contains TODO "RET504", # Unnecessary variable assignment before `return` statement + "G004", # Logging statement uses f-string + "PD011", # Use `.to_numpy()` instead of `.values` (does not work out of the box) + "RUF012", # Mutable class attributes should be annotated with `typing.ClassVar` + "UP038", # (non-pep604-isinstance) ] fix = true show-fixes = true -unfixable = ["UP007"] +unfixable = ["UP007", "I001"] [tool.ruff.per-file-ignores] "tests/*" = [ "PLR2004", # Magic value used in comparison + "ANN201", # Missing return type annotation for public function +] +"*/__init__.py" = [ + "D104", # Missing docstring in public package ] diff --git a/tests/test_calculations.py b/tests/test_calculations.py index 9d7e3c69..919b47e1 100644 --- a/tests/test_calculations.py +++ b/tests/test_calculations.py @@ -1,10 +1,13 @@ """Module to test oemof simulation results.""" +import os +import pandas as pd from django.test import SimpleTestCase +from django_oemof import models from django_oemof import results as oemof_results from django_oemof import simulation -from digiplan.map import calculations +from digiplan.map import calculations, charts class SimulationTest(SimpleTestCase): @@ -12,24 +15,47 @@ class SimulationTest(SimpleTestCase): databases = ("default",) # Needed, as otherwise django complains about tests using "default" DB parameters = { - "s_v_2": 100, + "s_v_1": None, "s_v_3": 100, "s_v_4": 100, + "s_v_5": 100, "s_w_1": 1000, + "w_v_1": None, "w_v_3": 100, "w_v_4": 100, "w_v_5": 100, "s_pv_ff_1": 100, "s_pv_d_1": 100, - "s_b_1": 100, - "ror": 100, - "w_z_wp_1": 100, - "w_d_wp_1": 100, + "s_h_1": 100, + "s_s_g_1": 100, + "w_d_wp_3": 100, + "w_d_wp_4": 100, + "w_d_wp_5": 100, + "w_z_wp_3": 100, + "w_d_s_1": 50, + "w_z_s_1": 53, + "w_d_wp_1": True, + "w_z_wp_1": None, + "w_d_s_3": None, + "w_z_s_3": None, + "s_w_3": None, + "s_w_4": None, + "s_w_4_1": None, + "s_w_4_2": None, + "s_w_5": None, + "s_w_5_1": None, + "s_w_5_2": None, + "s_pv_ff_3": None, + "s_pv_ff_4": None, + "s_pv_d_3": None, + "s_pv_d_4": None, } def setUp(self) -> None: """Starts/loads oemof simulation for given parameters.""" self.simulation_id = simulation.simulate_scenario("scenario_2045", self.parameters) + if os.environ.get("TEST_SHOW_SIMULATION_RESULTS", "False") == "True": + self.results = models.Simulation.objects.get(pk=self.simulation_id).dataset.restore_results() def tearDown(self) -> None: # noqa: D102 Needed to keep results in test DB pass @@ -39,10 +65,56 @@ def tearDownClass(cls): # noqa: D102, ANN206 Needed to keep results in test DB pass +class EnergySharePerMunicipalityTest(SimpleTestCase): + """Test energy shares per municipality calculation.""" + + databases = ("default",) + + def test_energy_shares_per_municipality(self): # noqa: D102 + results = calculations.energy_shares_per_municipality() + assert len(results) == 20 + + +class ElectricityDemandPerMunicipalityTest(SimpleTestCase): + """Test electricity demand per municipality calculation.""" + + databases = ("default",) + + def test_electricity_demand_per_municipality(self): # noqa: D102 + results = calculations.electricity_demand_per_municipality() + assert len(results) == 20 + assert len(results.columns) == 3 + + +class HeatDemandPerMunicipalityTest(SimpleTestCase): + """Test heat demand per municipality calculation.""" + + databases = ("default",) + + def test_heat_demand_per_municipality(self): # noqa: D102 + results = calculations.heat_demand_per_municipality() + assert len(results) == 20 + assert len(results.columns) == 3 + + +class PotentialShareTest(SimpleTestCase): + """Test disaggregation of renewable potentials.""" + + def test_potential_share(self): + """Test renewable capacities.""" + parameters = { + "s_w_3": True, + "s_pv_ff_3": 50, + "s_pv_ff_4": 50, + } + calculations.calculate_potential_shares(parameters) + # assert results.sum() almost [1,1,1,1] + + class ElectricityProductionTest(SimulationTest): """Test electricity production calculation.""" - def test_electricity_production(self): # noqa: D102,ANN201 + def test_electricity_production(self): # noqa: D102 results = oemof_results.get_results( self.simulation_id, calculations=[calculations.electricity_production], @@ -50,10 +122,17 @@ def test_electricity_production(self): # noqa: D102,ANN201 assert list(results.values())[0].iloc[0] > 0 +class ElectricityProductionFutureTest(SimulationTest): + """Test electricity production calculation.""" + + def test_electricity_production(self): # noqa: D102 + calculations.energies_per_municipality_2045(self.simulation_id) + + class HeatProductionTest(SimulationTest): """Test heat production calculation.""" - def test_heat_production(self): # noqa: D102,ANN201 + def test_heat_production(self): # noqa: D102 results = oemof_results.get_results( self.simulation_id, calculations=[calculations.heat_production], @@ -64,18 +143,18 @@ def test_heat_production(self): # noqa: D102,ANN201 class ElectricityDemandTest(SimulationTest): """Test electricity demand calculation.""" - def test_electricity_demand(self): # noqa: D102,ANN201 + def test_electricity_demand(self): # noqa: D102 results = oemof_results.get_results( self.simulation_id, calculations=[calculations.electricity_demand], ) - assert list(results.values())[0].iloc[0] > 0 + assert list(results.values())[0].iloc[1] > 0 class HeatDemandTest(SimulationTest): """Test heat demand calculation.""" - def test_heat_demand(self): # noqa: D102,ANN201 + def test_heat_demand(self): # noqa: D102 results = oemof_results.get_results( self.simulation_id, calculations=[calculations.heat_demand], @@ -86,7 +165,7 @@ def test_heat_demand(self): # noqa: D102,ANN201 class ElectricityProductionFromBiomassTest(SimulationTest): """Test electricity production from biomass calculation.""" - def test_electricity_production_from_biomass(self): # noqa: D102,ANN201 + def test_electricity_production_from_biomass(self): # noqa: D102 results = calculations.electricity_from_from_biomass(self.simulation_id) assert isinstance(results, float) is True @@ -94,14 +173,43 @@ def test_electricity_production_from_biomass(self): # noqa: D102,ANN201 class ElectricityOverviewTest(SimulationTest): """Test electricity overview calculation.""" - def test_electricity_overview(self): # noqa: D102,ANN201 + def test_electricity_overview(self): # noqa: D102 result = calculations.electricity_overview(self.simulation_id) assert len(result) == 12 +class MunicipalityTest(SimpleTestCase): + """Test.""" + + databases = ("default",) + + def test_square(self): + """Test.""" + series = pd.Series([1, 2, 3], index=["a", "b", "c"]) + calculations.value_per_municipality(series) + + class HeatOverviewTest(SimulationTest): """Test heat overview calculation.""" - def test_heat_overview(self): # noqa: D102,ANN201 + def test_heat_overview(self): # noqa: D102 result = calculations.heat_overview(self.simulation_id) assert len(result) == 3 + + +class ElectricityOverviewChartTest(SimulationTest): + """Test electricity overview chart creation.""" + + def test_electricity_overview_chart(self): # noqa: D102 + chart = charts.ElectricityOverviewChart(self.simulation_id) + options = chart.render() + assert options["series"][0]["data"][2] == 4369687.261432747 + + +class HeatOverviewChartTest(SimulationTest): + """Test heat overview chart creation.""" + + def test_heat_overview_chart(self): # noqa: D102 + chart = charts.HeatOverviewChart(self.simulation_id) + options = chart.render() + assert options["series"][0]["data"][1] == 3512007725.957367 diff --git a/tests/test_schemas.py b/tests/test_schemas.py deleted file mode 100644 index 2384b8be..00000000 --- a/tests/test_schemas.py +++ /dev/null @@ -1,68 +0,0 @@ -# pylint: disable=C0415 -import json -import pathlib - -import jsonschema - -from config.schemas import ( - CHART_SCHEMA, - KEY_VALUES_SCHEMA, - LEGEND_SCHEMA, - POPUP_SCHEMA, - SOURCES_SCHEMA, -) - -# Components Schema Tests - -TEST_DIR = pathlib.Path(__file__).parent -TEST_SCHEMAS_DIR = TEST_DIR / "test_data" / "schemas" - - -def test_if_chart_energy_consumption_example_validates(): - with open(TEST_SCHEMAS_DIR / "chart.energy_consumption.example.json", "rb") as f: - CHART_ENERGY_CONSUMPTION_EXAMPLE = json.loads(f.read()) - - assert jsonschema.validate(CHART_ENERGY_CONSUMPTION_EXAMPLE, CHART_SCHEMA) is None # noqa: S101 - - -def test_if_chart_population_example_validates(): - with open(TEST_SCHEMAS_DIR / "chart.population.example.json", "rb") as f: - CHART_POPULATION_EXAMPLE = json.loads(f.read()) - assert jsonschema.validate(CHART_POPULATION_EXAMPLE, CHART_SCHEMA) is None # noqa: S101 - - -def test_if_key_values_example_validates(): - with open(TEST_SCHEMAS_DIR / "key-values.example.json", "rb") as f: - KEY_VALUES_EXAMPLE = json.loads(f.read()) - assert jsonschema.validate(KEY_VALUES_EXAMPLE, KEY_VALUES_SCHEMA) is None # noqa: S101 - - -def test_if_sources_example_validates(): - with open(TEST_SCHEMAS_DIR / "sources.example.json", "rb") as f: - SOURCES_EXAMPLE = json.loads(f.read()) - assert jsonschema.validate(SOURCES_EXAMPLE, SOURCES_SCHEMA) is None # noqa: S101 - - -# Schema Tests - - -def test_if_legend_example_validates(): - with open(TEST_SCHEMAS_DIR / "legend.example.json", "rb") as f: - LEGEND_EXAMPLE = json.loads(f.read()) - assert jsonschema.validate(LEGEND_EXAMPLE, LEGEND_SCHEMA) is None # noqa: S101 - - -def test_if_popup_example_validates(): - schema_store = { - CHART_SCHEMA["$id"]: CHART_SCHEMA, - KEY_VALUES_SCHEMA["$id"]: KEY_VALUES_SCHEMA, - POPUP_SCHEMA["$id"]: POPUP_SCHEMA, - SOURCES_SCHEMA["$id"]: SOURCES_SCHEMA, - } - resolver = jsonschema.RefResolver.from_schema(POPUP_SCHEMA, store=schema_store) - validator = jsonschema.Draft4Validator(POPUP_SCHEMA, resolver=resolver) - - with open(TEST_SCHEMAS_DIR / "popup.example.json", "rb") as f: - POPUP_EXAMPLE = json.loads(f.read()) - - assert validator.validate(POPUP_EXAMPLE) is None # noqa: S101 diff --git a/tests/test_urls.py b/tests/test_urls.py index d13c941d..a1d18fd7 100644 --- a/tests/test_urls.py +++ b/tests/test_urls.py @@ -1,17 +1,23 @@ +"""Base tests to see if django runserver comes up.""" from django.test import TestCase # Simple tests on project level class HomepageUrlTests(TestCase): + """Basic checks for homepage.""" + def test_homepage_status_code(self): + """Checks if index page is loaded.""" response = self.client.get("/") # redirect to /de/ as standard language (302=Redirect) assert response.status_code == 302 def test_german_url(self): + """Checks if german version runs.""" response = self.client.get("/de/") assert response.status_code == 200 def test_english_url(self): + """Checks if english version runs.""" response = self.client.get("/en/") assert response.status_code == 200