Release 2018-12-20

Open-Power-System-Data · Dec 20, 2018 · c7c439e · c7c439e
1 parent 4d45b31
commit c7c439e
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 37 deletions.
diff --git a/checksums.txt b/checksums.txt
@@ -1,5 +1,5 @@
-conventional_power_plants_DE.csv,bda10d8d5eab6898620d1f974e7996784e5722003b065c1dcf06f59a7485e591
-conventional_power_plants_DE.xlsx,a73fabb01b6fc872f4d945a7167493751a44288a5bde78ff949c1cd4acd12801
+conventional_power_plants_DE.csv,31b94b386913b05f451814141cdc6a315bd68c2b2b1bf3eb55595aafe39c80b9
+conventional_power_plants_DE.xlsx,db8578101ad8b8ee82bcf2abfce0e950a1138fa0a2a7fd910d3c348948c48b4b
 conventional_power_plants_EU.csv,0c4f9fb7ca2ef2fde265ae96d28dcda24b12773ebb2cce023b1028d60018f2d4
-conventional_power_plants_EU.xlsx,08c13d0d44a85b35adcd3e003d313bb41272b57f598cf25d7950c90b76a4dcac
-conventional_power_plants.sqlite,67d4b84472a3e368db596fc8b8423c164d1c33882880aeac3c833cd2610d74d8
+conventional_power_plants_EU.xlsx,87fc3e9deedfe3f7e0728a2f192f4e2177e9ef7c0b1b54bbae0cf6fb3aacdbea
+conventional_power_plants.sqlite,d8c4a4e2dfc6a881b7f44b2dbca6af8da33f45b250dff71481b99a80caeea203
diff --git a/download_and_process_DE.ipynb b/download_and_process_DE.ipynb
@@ -288,6 +288,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
+    "collapsed": true,
     "scrolled": false
    },
    "outputs": [],
@@ -382,6 +383,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
+    "collapsed": true,
     "scrolled": false
    },
    "outputs": [],
@@ -437,6 +439,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
+    "collapsed": true,
     "scrolled": false
    },
    "outputs": [],
@@ -1964,7 +1967,6 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": true,
     "scrolled": false
    },
    "outputs": [],
@@ -2002,7 +2004,6 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": true,
     "scrolled": false
    },
    "outputs": [],

diff --git a/download_and_process_EU.ipynb b/download_and_process_EU.ipynb
@@ -138,8 +138,6 @@
     "import sqlite3\n",
     "import zipfile\n",
     "import io\n",
-    "from io import BytesIO\n",
-    "from PIL import Image\n",
     "import requests\n",
     "import csv\n",
     "\n",
@@ -254,7 +252,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "conf = \"\"\"\n",
@@ -681,7 +681,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "for country, tso in conf.items():\n",
@@ -805,7 +807,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "data_BE = importdata('BE', 'Elia')\n",
@@ -830,7 +834,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Translate columns\n",
@@ -908,7 +914,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Translate technologies\n",
@@ -1017,6 +1025,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
+    "collapsed": true,
     "scrolled": false
    },
    "outputs": [],
@@ -1287,7 +1296,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Access the second list with EIC-Codes and geographic coordinates\n",
@@ -1410,7 +1421,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Show duplicate data entries\n",
@@ -1514,7 +1527,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Access the second list with EIC-Codes and geographic coordinates\n",
@@ -1696,7 +1711,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Access the second list\n",
@@ -1857,7 +1874,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Access the second list with EIC-Codes and geographic coordinates\n",
@@ -2146,7 +2165,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "data_CH = data_CH.append(data_nuclear_CH)\n",
@@ -2285,7 +2306,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Access the second list with EIC-Codes and geographic coordinates\n",
@@ -2545,7 +2568,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Access the second list with EIC-Codes and geographic coordinates\n",
@@ -2591,7 +2616,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "data_ES = importdata('ES', 'SEDE')"
@@ -2758,7 +2785,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "dict_technologies_ES = {'Aprovechamiento de energias residuales': 'NaN',\n",
@@ -2851,7 +2880,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Access the second list with EIC-Codes and geographic coordinates\n",
@@ -3044,7 +3075,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "dict_energysources_UK = {'Biomass': 'Biomass and biogas',\n",
@@ -3103,7 +3136,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Access the second list with EIC-Codes and geographic coordinates\n",
@@ -3142,7 +3177,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Access local file\n",
@@ -3169,7 +3206,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Access local file\n",
@@ -3196,7 +3235,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Access local file\n",
@@ -3226,7 +3267,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Access local file\n",
@@ -3253,7 +3296,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Access local file for conventional plants\n",
@@ -3290,7 +3335,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Access local file for conventional plants\n",
@@ -3322,7 +3369,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "dataframes = [#data_BE,\n",
@@ -3355,7 +3404,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Import energy source level definition\n",
@@ -3436,6 +3487,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
+    "collapsed": true,
     "scrolled": true
    },
    "outputs": [],

diff --git a/input/metadata.yml b/input/metadata.yml
@@ -5,7 +5,7 @@ longDescription: This datapackage contains data on conventional power plants for
 profile: tabular_data_package
 _external: false
 _metadataVersion: 1.2
-attribution: "Attribution should be given as follows: Open Power System Data. 2018. Data Package Conventional power plants. Version 2018-12-XX. https://doi.org/10.25832/conventional_power_plants/2018-12-XX. (Primary data from various sources, for a complete list see URL)."
+attribution: "Attribution should be given as follows: Open Power System Data. 2018. Data Package Conventional power plants. Version 2018-12-20. https://doi.org/10.25832/conventional_power_plants/2018-12-20. (Primary data from various sources, for a complete list see URL)."
 keywords:
     - conventional power plants
     - Open Power System Data
@@ -44,7 +44,7 @@ resources:
       profile: tabular-data-resource
       title: List of conventional power plants in Germany
       bytes: 300999
-      hash: bda10d8d5eab6898620d1f974e7996784e5722003b065c1dcf06f59a7485e591
+      hash: 31b94b386913b05f451814141cdc6a315bd68c2b2b1bf3eb55595aafe39c80b9
       path: conventional_power_plants_DE.csv
       format: csv
       mediatype: text/csv
@@ -178,7 +178,7 @@ resources:
       profile: tabular-data-resource
       title: List of conventional power plants in Germany
       bytes: 160749
-      hash: a73fabb01b6fc872f4d945a7167493751a44288a5bde78ff949c1cd4acd12801
+      hash: db8578101ad8b8ee82bcf2abfce0e950a1138fa0a2a7fd910d3c348948c48b4b
       path: conventional_power_plants_DE.xlsx
       format: xlsx
       mediatype: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet