Merge pull request #28 from milos-simic/master

Minor changes
Open-Power-System-Data · Aug 23, 2020 · bf1b84d · bf1b84d
2 parents edc4afa + 01ce20c
commit bf1b84d
Show file tree

Hide file tree

Showing 5 changed files with 701 additions and 139 deletions.
diff --git a/download_and_process.ipynb b/download_and_process.ipynb
diff --git a/input/countries.csv b/input/countries.csv
@@ -5,7 +5,7 @@ Since August 2014 the BNetzA is responsible to publish the renewable power plant
 
 From the beginning of 2019, BNetzA has switched to the Marktstammdatenregister (MaStR, central register for installation data). This is, however, not used yet for OPSD data. We will change to using the MaStR most likely for the 2020 version of the OPSD data package.
 "
-FR,France,Energy sources… summarize this once done,
+FR,France,"Renewable energy sources in France (wind, solar, hydro, geothermal, bioenergy, marine).",
 DK,Denmark,Wind and phovoltaic power plants with a high level of detail.,
 CH,Switzerland,All renewable-energy power plants supported by the feed-in-tariff KEV (Kostendeckende Einspeisevergütung).,
 PL,Poland,Summed capacity and number of installations per energy source per municipality (Powiat).,

diff --git a/input/sources.csv b/input/sources.csv
@@ -2,10 +2,10 @@ source,full_name,country,url,filename,file_type,active,short_description,long_de
 bnetza,Bundesnetzagentur,DE,https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Energie/Unternehmen_Institutionen/ErneuerbareEnergien/ZahlenDatenInformationen/VOeFF_Registerdaten/2019_01_Veroeff_RegDaten.xlsx?__blob=publicationFile&v=2,2019_01_Veroeff_RegDaten.xlsx,data,yes,Bundesnetzagentur register of renewable power plants (excl. PV),,get
 bnetza_pv_historic,bnetza_pv_historic,DE,https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Energie/Unternehmen_Institutionen/ErneuerbareEnergien/ZahlenDatenInformationen/PV_Datenmeldungen/Archiv_PV/Meldungen_Aug-Juni2017.xlsx?__blob=publicationFile&v=2,Meldungen_Aug-Juni2017.xlsx,data,yes,Bundesnetzagentur register of PV power plants,,get
 bnetza_pv,bnetza_pv,DE,https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Energie/Unternehmen_Institutionen/ErneuerbareEnergien/ZahlenDatenInformationen/PV_Datenmeldungen/Meldungen_Juli17-Jan19.xlsx?__blob=publicationFile&v=2,Meldungen_Juli17-Jan19.xlsx,data,yes,Bundesnetzagentur register of PV power plants,,get
-Amprion,Amprion,DE,https://www.netztransparenz.de/portals/1/Netztransparenz%20Anlagenstammdaten%202018%20Amprion%20GmbH.zip,Netztransparenz Anlagenstammdaten 2018 Amprion GmbH.zip,data,yes,Netztransparenz.de - information platform of German TSOs (register of renewable power plants in their control area),,get
-TransnetBW,TransnetBW,DE,https://www.netztransparenz.de/portals/1/Netztransparenz%20Anlagenstammdaten%202018%20TransnetBW%20GmbH.zip,Netztransparenz Anlagenstammdaten 2018 TransnetBW GmbH.zip,data,yes,Netztransparenz.de - information platform of German TSOs (register of renewable power plants in their control area),,get
-50Hertz,50Hertz,DE,https://www.netztransparenz.de/portals/1/Netztransparenz%20Anlagenstammdaten%202018%2050Hertz%20Transmission%20GmbH.zip,Netztransparenz Anlagenstammdaten 2018 50Hertz Transmission GmbH.zip,data,yes,Netztransparenz.de - information platform of German TSOs (register of renewable power plants in their control area),,get
-TenneT,Tennet,DE,https://www.netztransparenz.de/portals/1/Netztransparenz%20Anlagenstammdaten%202018%20TenneT%20TSO%20GmbH.zip,Netztransparenz Anlagenstammdaten 2018 TenneT TSO GmbH.zip,data,yes,Netztransparenz.de - information platform of German TSOs (register of renewable power plants in their control area),,get
+Amprion,Amprion,DE,https://www.netztransparenz.de/portals/1/Netztransparenz%20Anlagenstammdaten%202019%20Amprion%20GmbH.zip,Netztransparenz Anlagenstammdaten 2019 Amprion GmbH.zip,data,yes,Netztransparenz.de - information platform of German TSOs (register of renewable power plants in their control area),,get
+TransnetBW,TransnetBW,DE,https://www.netztransparenz.de/portals/1/Netztransparenz%20Anlagenstammdaten%202019%20TransnetBW%20GmbH.zip,Netztransparenz Anlagenstammdaten 2019 TransnetBW GmbH.zip,data,yes,Netztransparenz.de - information platform of German TSOs (register of renewable power plants in their control area),,get
+50Hertz,50Hertz,DE,https://www.netztransparenz.de/portals/1/Netztransparenz%20Anlagenstammdaten%202019%2050Hertz%20Transmission%20GmbH.zip,Netztransparenz Anlagenstammdaten 2019 50Hertz Transmission GmbH.zip,data,yes,Netztransparenz.de - information platform of German TSOs (register of renewable power plants in their control area),,get
+TenneT,Tennet,DE,https://www.netztransparenz.de/portals/1/Netztransparenz%20Anlagenstammdaten%202019%20TenneT%20TSO%20GmbH.zip,Netztransparenz Anlagenstammdaten 2019 TenneT TSO GmbH.zip,data,yes,Netztransparenz.de - information platform of German TSOs (register of renewable power plants in their control area),,get
 Energistyrelsen,Energystyrelsen,DK,https://ens.dk/sites/ens.dk/files/Statistik/anlaegprodtilnettet.xls,anlaegprodtilnettet.xls,data,yes,Energy Agency Denmark,"The Danish Energy Agency publishes a national master data register for wind turbines which was created in collaboration with the transmission system operators. The publication is monthly as an Excel file. The data set includes all electricity-generating wind turbines with information about technical data, location data and production data.",get
 Energinet,Energinet,DK,https://data.open-power-system-data.org/renewable_power_plants/2018-03-08/original_data/SolcellerGraf-2016-11.xlsx,SolcellerGraf-2016-11.xlsx,data,no,Transmission system Operator in Denmark,"The photovoltaic statistic used to be published from Energinet, included information about location, year of implementing, installed capacity and number of systems. Since Energinet stopped publishing this, and the Danish Energy Agency, which has taken over the job of keeping that register has not published a register yet, we revert to old data for Danish solar from our previous OPSD data package version.",get
 gouv.fr,Ministère de la Transition écologique et solidaire,FR,http://www.statistiques.developpement-durable.gouv.fr/sites/default/files/2019-01/donnees-locales-2017-loi2000-secretise.xls,donnees-locales-2017-loi2000-secretise.xls,data,yes,Ministry for the Ecological and Inclusive Transition,The data is annually published on the French [website for statistics](https://www.statistiques.developpement-durable.gouv.fr/donnees-locales-relatives-aux-installations-de-production-delectricite-renouvelable-beneficiant-0?rubrique=23&dossier=189) as an Excel file. The Excel chart includes number and installed capacity of the different renewable source for every municipality in France. It is limited to the plants which are covered by article 10 of february 2000 by an agreement to a purchase commitment.,get

diff --git a/main.ipynb b/main.ipynb
@@ -51,6 +51,10 @@
    "cell_type": "code",
    "execution_count": 1,
    "metadata": {
+    "ExecuteTime": {
+     "end_time": "2020-08-20T09:29:37.605514Z",
+     "start_time": "2020-08-20T09:29:30.977553Z"
+    },
     "scrolled": false
    },
    "outputs": [],
@@ -65,7 +69,7 @@
     "import util.helper\n",
     "import util.visualizer\n",
     "\n",
-    "version = '2020-07-25'"
+    "version = '2020-08-25'"
    ]
   },
   {
@@ -79,6 +83,10 @@
    "cell_type": "code",
    "execution_count": 2,
    "metadata": {
+    "ExecuteTime": {
+     "end_time": "2020-08-20T09:29:48.988367Z",
+     "start_time": "2020-08-20T09:29:37.607232Z"
+    },
     "scrolled": false
    },
    "outputs": [
@@ -114,6 +122,10 @@
    "cell_type": "code",
    "execution_count": 3,
    "metadata": {
+    "ExecuteTime": {
+     "end_time": "2020-08-20T09:29:49.334645Z",
+     "start_time": "2020-08-20T09:29:48.989820Z"
+    },
     "scrolled": false
    },
    "outputs": [
@@ -132,10 +144,10 @@
        "- [Bundesnetzagentur](https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Energie/Unternehmen_Institutionen/ErneuerbareEnergien/ZahlenDatenInformationen/VOeFF_Registerdaten/2019_01_Veroeff_RegDaten.xlsx?__blob=publicationFile&v=2) - Bundesnetzagentur register of renewable power plants (excl. PV)\n",
        "- [bnetza_pv_historic](https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Energie/Unternehmen_Institutionen/ErneuerbareEnergien/ZahlenDatenInformationen/PV_Datenmeldungen/Archiv_PV/Meldungen_Aug-Juni2017.xlsx?__blob=publicationFile&v=2) - Bundesnetzagentur register of PV power plants\n",
        "- [bnetza_pv](https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Energie/Unternehmen_Institutionen/ErneuerbareEnergien/ZahlenDatenInformationen/PV_Datenmeldungen/Meldungen_Juli17-Jan19.xlsx?__blob=publicationFile&v=2) - Bundesnetzagentur register of PV power plants\n",
-       "- [Amprion](https://www.netztransparenz.de/portals/1/Netztransparenz%20Anlagenstammdaten%202018%20Amprion%20GmbH.zip) - Netztransparenz.de - information platform of German TSOs (register of renewable power plants in their control area)\n",
-       "- [TransnetBW](https://www.netztransparenz.de/portals/1/Netztransparenz%20Anlagenstammdaten%202018%20TransnetBW%20GmbH.zip) - Netztransparenz.de - information platform of German TSOs (register of renewable power plants in their control area)\n",
-       "- [50Hertz](https://www.netztransparenz.de/portals/1/Netztransparenz%20Anlagenstammdaten%202018%2050Hertz%20Transmission%20GmbH.zip) - Netztransparenz.de - information platform of German TSOs (register of renewable power plants in their control area)\n",
-       "- [Tennet](https://www.netztransparenz.de/portals/1/Netztransparenz%20Anlagenstammdaten%202018%20TenneT%20TSO%20GmbH.zip) - Netztransparenz.de - information platform of German TSOs (register of renewable power plants in their control area)\n",
+       "- [Amprion](https://www.netztransparenz.de/portals/1/Netztransparenz%20Anlagenstammdaten%202019%20Amprion%20GmbH.zip) - Netztransparenz.de - information platform of German TSOs (register of renewable power plants in their control area)\n",
+       "- [TransnetBW](https://www.netztransparenz.de/portals/1/Netztransparenz%20Anlagenstammdaten%202019%20TransnetBW%20GmbH.zip) - Netztransparenz.de - information platform of German TSOs (register of renewable power plants in their control area)\n",
+       "- [50Hertz](https://www.netztransparenz.de/portals/1/Netztransparenz%20Anlagenstammdaten%202019%2050Hertz%20Transmission%20GmbH.zip) - Netztransparenz.de - information platform of German TSOs (register of renewable power plants in their control area)\n",
+       "- [Tennet](https://www.netztransparenz.de/portals/1/Netztransparenz%20Anlagenstammdaten%202019%20TenneT%20TSO%20GmbH.zip) - Netztransparenz.de - information platform of German TSOs (register of renewable power plants in their control area)\n",
        "\n",
        "The columns available in the data table provided by OPSD:\n",
        "\n",
@@ -176,7 +188,7 @@
      "data": {
       "text/markdown": [
        "## France - FR\n",
-       "Energy sources… summarize this once done\n",
+       "Renewable energy sources in France (wind, solar, hydro, geothermal, bioenergy, marine).\n",
        "\n",
        "- [Ministère de la Transition écologique et solidaire](http://www.statistiques.developpement-durable.gouv.fr/sites/default/files/2019-01/donnees-locales-2017-loi2000-secretise.xls) - Ministry for the Ecological and Inclusive Transition\n",
        "\n",
@@ -513,6 +525,10 @@
    "cell_type": "code",
    "execution_count": 4,
    "metadata": {
+    "ExecuteTime": {
+     "end_time": "2020-08-20T09:29:49.420806Z",
+     "start_time": "2020-08-20T09:29:49.335696Z"
+    },
     "scrolled": false
    },
    "outputs": [
@@ -704,6 +720,10 @@
    "cell_type": "code",
    "execution_count": 5,
    "metadata": {
+    "ExecuteTime": {
+     "end_time": "2020-08-20T09:29:49.598217Z",
+     "start_time": "2020-08-20T09:29:49.423217Z"
+    },
     "scrolled": false
    },
    "outputs": [