Merge pull request #407 from openego/fixes/#349-add-egon-prefix-to-mv…

…_grid_districts

Add egon-prefix to db-tables

CHANGELOG.rst

@@ -245,3 +245,6 @@ Bug fixes
   `#398 <https://github.com/openego/eGon-data/issues/398>`_
 * Add missing dependency in pipeline.py
   `#412 <https://github.com/openego/eGon-data/issues/412>`_
+* Add prefix egon to MV grid district tables
+  `#349 <https://github.com/openego/eGon-data/issues/349>`_
+

src/egon/data/datasets.yml

@@ -311,7 +311,7 @@ power_plants:
       capacities: "supply.egon_scenario_capacities"
       geom_germany: "boundaries.vg250_sta_union"
       geom_federal_states: "boundaries.vg250_lan"
-      mv_grid_districts: "grid.mv_grid_districts"
+      egon_mv_grid_district: "grid.egon_mv_grid_district"
       ehv_voronoi: "grid.egon_ehv_substation_voronoi"
   target:
       table: 'egon_power_plants'
@@ -360,9 +360,9 @@ map_zensus_grid_districts:
     zensus_population:
       schema: 'society'
       table: 'destatis_zensus_population_per_ha'
-    mv_grid_districts:
+    egon_mv_grid_district:
       schema: 'grid'
-      table: 'mv_grid_districts'
+      table: 'egon_mv_grid_district'
   targets:
     map:
       schema: 'boundaries'
@@ -398,9 +398,9 @@ electrical_load_curves_cts:
 
 map_mvgrid_vg250:
   sources:
-    mv_grid_districts:
+    egon_mv_grid_district:
       schema: 'grid'
-      table: 'mv_grid_districts'
+      table: 'egon_mv_grid_district'
     federal_states:
       schema: 'boundaries'
       table: 'vg250_lan_union'
@@ -414,9 +414,9 @@ solar_rooftop:
     solar_feedin:
       schema: 'supply'
       table: 'egon_era5_renewable_feedin'
-    mv_grid_districts:
+    egon_mv_grid_district:
       schema: 'grid'
-      table: 'mv_grid_districts'
+      table: 'egon_mv_grid_district'
     weather_cells:
       schema: 'supply'
       table: 'egon_era5_weather_cells'
@@ -476,7 +476,7 @@ heat_supply:
       table: 'egon_map_mvgriddistrict_vg250'
     mv_grids:
       schema: 'grid'
-      table: 'mv_grid_districts'
+      table: 'egon_mv_grid_district'
     map_dh:
       schema: 'demand'
       table: 'egon_map_zensus_district_heating_areas'
@@ -504,7 +504,7 @@ etrago_heat:
       table: 'egon_map_zensus_district_heating_areas'
     mv_grids:
       schema: 'grid'
-      table: 'mv_grid_districts'
+      table: 'egon_mv_grid_district'
     district_heating_supply:
       schema: 'supply'
       table: 'egon_district_heating'
@@ -517,9 +517,9 @@ etrago_heat:
     solar_thermal_feedin:
       schema: 'supply'
       table: 'egon_era5_renewable_feedin'
-    mv_grid_districts:
+    egon_mv_grid_district:
       schema: 'grid'
-      table: 'mv_grid_districts'
+      table: 'egon_mv_grid_district'
     heat_demand:
       schema: 'demand'
       table: 'egon_peta_heat'
@@ -613,9 +613,9 @@ electrical_load_curves_industry:
     hvmv_substation:
       schema: 'grid'
       table: 'egon_hvmv_substation'
-    mv_grid_districts:
+    egon_mv_grid_district:
       schema: 'grid'
-      table: 'mv_grid_districts'
+      table: 'egon_mv_grid_district'
   targets:
     osm_load:
       schema: 'demand'
@@ -651,7 +651,7 @@ chp_location:
       schema: 'supply'
     mastr_combustion: 'bnetza_mastr_combustion_cleaned.csv'
     mastr_location: 'location_elec_generation_raw.csv'
-    mv_grid_districts: 'grid.mv_grid_districts'
+    egon_mv_grid_district: 'grid.egon_mv_grid_district'
     ehv_voronoi: "grid.egon_ehv_substation_voronoi"
     etrago_buses:
       table: 'egon_pf_hv_bus'

src/egon/data/datasets/heat_demand/__init__.py

@@ -202,7 +202,7 @@ def cutout_heat_demand_germany():
         The alternative of cutting out Germany from the pan-European raster
         based on German census cells, instead of using state boundaries with
         low resolution (to avoid inaccuracies), was not implemented in order to
-        achieve consistency with other datasets (e.g. mv_grid_districts).
+        achieve consistency with other datasets (e.g. egon_mv_grid_district).
         Besides, all attempts to read, (union) and load cells from the local
         database failed, but were documented as commented code within this
         function and afterwards removed.