From ce8e3cfaa79961d5b199114780210c718d324f83 Mon Sep 17 00:00:00 2001 From: Cristian Stoica Date: Fri, 30 Apr 2021 22:00:02 +0300 Subject: [PATCH] Updated with data from PRIS database (update 2021/04/30). --- CHANGELOG.md | 4 ++++ README.md | 2 +- data/csv/denormalized/nuclear_power_plants.csv | 4 ++-- data/csv/raw/4-nuclear_power_plants.csv | 4 ++-- data/json/denormalized/nuclear_power_plants.json | 14 +++++++------- data/json/raw/4-nuclear_power_plants.json | 14 +++++++------- data/mysql/4-nuclear_power_plants.sql | 6 +++--- 7 files changed, 26 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90c3de8..29f8d89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.17.7 (2021-04-30) + + - updated with data from PRIS database (update 2021/04/30). + ## 0.17.6 (2021-04-20) - updated with data from PRIS database (update 2021/04/19); diff --git a/README.md b/README.md index 7d71e2b..bdeb387 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This repository contains a database with information about Nuclear Power Plants ### Version Database version: **0.17.0** (**2020/04/19**) -Dataset last updated in version: **0.17.6** (**2021/04/20**) +Dataset last updated in version: **0.17.7** (**2021/04/30**) ### Changelog diff --git a/data/csv/denormalized/nuclear_power_plants.csv b/data/csv/denormalized/nuclear_power_plants.csv index 3438b71..9a629cd 100644 --- a/data/csv/denormalized/nuclear_power_plants.csv +++ b/data/csv/denormalized/nuclear_power_plants.csv @@ -423,7 +423,7 @@ Id,Name,Latitude,Longitude,Country,CountryCode,Status,ReactorType,ReactorModel,C 423,Latina,41.427000,12.808000,Italy,IT,Shutdown,GCR,MAGNOX,1958-11-01,1964-01-01,1987-12-01,200,2015-05-24T04:51:26+03:00,WNA/IAEA,318 424,Leibstadt,47.601000,8.183000,Switzerland,CH,Operational,BWR,BWR-6,1974-01-01,1984-12-15,,960,2015-05-24T04:50:39+03:00,WNA/IAEA,59 425,Leningrad 2-1,59.837000,29.039000,Russia,RU,Operational,PWR,VVER V-491,2008-10-25,2018-10-29,,1066,2019-11-22,WNA/IAEA,900 -426,Leningrad 2-2,59.837000,29.039000,Russia,RU,Operational,PWR,VVER V-491,2010-04-15,,,1066,2021-01-06T01:19:47+02:00,WNA/IAEA,901 +426,Leningrad 2-2,59.837000,29.039000,Russia,RU,Operational,PWR,VVER V-491,2010-04-15,2021-03-18,,1066,2021-04-30T21:49:18+03:00,WNA/IAEA,901 427,Leningrad 2-3,59.837000,29.039000,Russia,RU,Planned,PWR,VVER V-491,,,,1085,,Wikipedia, 428,Leningrad 2-4,59.837000,29.039000,Russia,RU,Planned,PWR,VVER V-491,,,,1085,,Wikipedia, 429,Leningrad-1,59.837000,29.039000,Russia,RU,Shutdown,LWGR,RBMK-1000,1970-03-01,1974-11-01,2018-12-22,925,2019-06-02T20:19:08+03:00,WNA/IAEA,474 @@ -775,7 +775,7 @@ Id,Name,Latitude,Longitude,Country,CountryCode,Status,ReactorType,ReactorModel,C 790,Taipingling-1,22.693056,114.983333,China,CN,Under Construction,PWR,HPR1000,2019-12-26,,,1116,2020-06-06T02:41:28+03:00,IAEA,1084 791,Zhangzhou-2,23.829167,117.491667,China,CN,Under Construction,PWR,HPR-1000,2020-09-04,,,1126,2021-01-09T20:00:00+02:00,IAEA/Wikipedia,1090 792,Taipingling-2,22.693056,114.983333,China,CN,Under Construction,PWR,HPR1000,2020-10-15,,,1116,2021-01-09T17:57:48+02:00,IAEA,1091 -793,Xiapu-1,26.803611,120.155000,China,CN,Under Construction,FBR,CFR-600,2017-12-29,,,600,2021-02-14T00:08:00+02:00,WNA/Wikipedia, +793,Xiapu-1,26.803611,120.155000,China,CN,Under Construction,FBR,CFR600,2017-12-29,,,642,2021-04-30T21:49:18+03:00,WNA/Wikipedia/IAEA,1101 794,Xiapu-2,26.803611,120.155000,China,CN,Under Construction,FBR,CFR-600,2020-12-27,,,600,2021-02-14T00:09:00+02:00,WNA/Wikipedia, 795,Cernavoda-4,44.322000,28.061000,Romania,RO,Suspended Construction,PHWR,,1985-08-15,,,655,2021-02-14T01:00:00+02:00,IAEA/Wikipedia, 796,Cernavoda-5,44.322000,28.061000,Romania,RO,Cancelled Construction,PHWR,,1987-05-12,,,655,2021-02-14T01:01:00+02:00,IAEA/Wikipedia, diff --git a/data/csv/raw/4-nuclear_power_plants.csv b/data/csv/raw/4-nuclear_power_plants.csv index 839dc1d..190b13a 100644 --- a/data/csv/raw/4-nuclear_power_plants.csv +++ b/data/csv/raw/4-nuclear_power_plants.csv @@ -423,7 +423,7 @@ Id,Name,Latitude,Longitude,CountryCode,StatusId,ReactorTypeId,ReactorModel,Const 423,Latina,41.427000,12.808000,IT,5,8,MAGNOX,1958-11-01,1964-01-01,1987-12-01,200,WNA/IAEA,2015-05-24T04:51:26+03:00,318 424,Leibstadt,47.601000,8.183000,CH,3,5,BWR-6,1974-01-01,1984-12-15,,960,WNA/IAEA,2015-05-24T04:50:39+03:00,59 425,Leningrad 2-1,59.837000,29.039000,RU,3,21,VVER V-491,2008-10-25,2018-10-29,,1066,WNA/IAEA,2019-11-22,900 -426,Leningrad 2-2,59.837000,29.039000,RU,3,21,VVER V-491,2010-04-15,,,1066,WNA/IAEA,2021-01-06T01:19:47+02:00,901 +426,Leningrad 2-2,59.837000,29.039000,RU,3,21,VVER V-491,2010-04-15,2021-03-18,,1066,WNA/IAEA,2021-04-30T21:49:18+03:00,901 427,Leningrad 2-3,59.837000,29.039000,RU,1,21,VVER V-491,,,,1085,Wikipedia,, 428,Leningrad 2-4,59.837000,29.039000,RU,1,21,VVER V-491,,,,1085,Wikipedia,, 429,Leningrad-1,59.837000,29.039000,RU,5,17,RBMK-1000,1970-03-01,1974-11-01,2018-12-22,925,WNA/IAEA,2019-06-02T20:19:08+03:00,474 @@ -775,7 +775,7 @@ Id,Name,Latitude,Longitude,CountryCode,StatusId,ReactorTypeId,ReactorModel,Const 790,Taipingling-1,22.693056,114.983333,CN,2,21,HPR1000,2019-12-26,,,1116,IAEA,2020-06-06T02:41:28+03:00,1084 791,Zhangzhou-2,23.829167,117.491667,CN,2,21,HPR-1000,2020-09-04,,,1126,IAEA/Wikipedia,2021-01-09T20:00:00+02:00,1090 792,Taipingling-2,22.693056,114.983333,CN,2,21,HPR1000,2020-10-15,,,1116,IAEA,2021-01-09T17:57:48+02:00,1091 -793,Xiapu-1,26.803611,120.155000,CN,2,7,CFR-600,2017-12-29,,,600,WNA/Wikipedia,2021-02-14T00:08:00+02:00, +793,Xiapu-1,26.803611,120.155000,CN,2,7,CFR600,2017-12-29,,,642,WNA/Wikipedia/IAEA,2021-04-30T21:49:18+03:00,1101 794,Xiapu-2,26.803611,120.155000,CN,2,7,CFR-600,2020-12-27,,,600,WNA/Wikipedia,2021-02-14T00:09:00+02:00, 795,Cernavoda-4,44.322000,28.061000,RO,8,20,,1985-08-15,,,655,IAEA/Wikipedia,2021-02-14T01:00:00+02:00, 796,Cernavoda-5,44.322000,28.061000,RO,9,20,,1987-05-12,,,655,IAEA/Wikipedia,2021-02-14T01:01:00+02:00, diff --git a/data/json/denormalized/nuclear_power_plants.json b/data/json/denormalized/nuclear_power_plants.json index d9ddecf..1be81f7 100644 --- a/data/json/denormalized/nuclear_power_plants.json +++ b/data/json/denormalized/nuclear_power_plants.json @@ -7642,10 +7642,10 @@ "ReactorType": "PWR", "ReactorModel": "VVER V-491", "ConstructionStartAt": "2010-04-15", - "OperationalFrom": null, + "OperationalFrom": "2021-03-18", "OperationalTo": null, "Capacity": 1066, - "LastUpdatedAt": "2021-01-06T01:19:47+02:00", + "LastUpdatedAt": "2021-04-30T21:49:18+03:00", "Source": "WNA/IAEA", "IAEAId": 901 }, @@ -13976,14 +13976,14 @@ "CountryCode": "CN", "Status": "Under Construction", "ReactorType": "FBR", - "ReactorModel": "CFR-600", + "ReactorModel": "CFR600", "ConstructionStartAt": "2017-12-29", "OperationalFrom": null, "OperationalTo": null, - "Capacity": 600, - "LastUpdatedAt": "2021-02-14T00:08:00+02:00", - "Source": "WNA/Wikipedia", - "IAEAId": null + "Capacity": 642, + "LastUpdatedAt": "2021-04-30T21:49:18+03:00", + "Source": "WNA/Wikipedia/IAEA", + "IAEAId": 1101 }, { "Id": 794, diff --git a/data/json/raw/4-nuclear_power_plants.json b/data/json/raw/4-nuclear_power_plants.json index 84497d1..998442a 100644 --- a/data/json/raw/4-nuclear_power_plants.json +++ b/data/json/raw/4-nuclear_power_plants.json @@ -7217,11 +7217,11 @@ "ReactorTypeId": 21, "ReactorModel": "VVER V-491", "ConstructionStartAt": "2010-04-15", - "OperationalFrom": null, + "OperationalFrom": "2021-03-18", "OperationalTo": null, "Capacity": 1066, "Source": "WNA/IAEA", - "LastUpdatedAt": "2021-01-06T01:19:47+02:00", + "LastUpdatedAt": "2021-04-30T21:49:18+03:00", "IAEAId": 901 }, { @@ -13199,14 +13199,14 @@ "CountryCode": "CN", "StatusId": 2, "ReactorTypeId": 7, - "ReactorModel": "CFR-600", + "ReactorModel": "CFR600", "ConstructionStartAt": "2017-12-29", "OperationalFrom": null, "OperationalTo": null, - "Capacity": 600, - "Source": "WNA/Wikipedia", - "LastUpdatedAt": "2021-02-14T00:08:00+02:00", - "IAEAId": null + "Capacity": 642, + "Source": "WNA/Wikipedia/IAEA", + "LastUpdatedAt": "2021-04-30T21:49:18+03:00", + "IAEAId": 1101 }, { "Id": 794, diff --git a/data/mysql/4-nuclear_power_plants.sql b/data/mysql/4-nuclear_power_plants.sql index ecb09dc..43d3fb2 100644 --- a/data/mysql/4-nuclear_power_plants.sql +++ b/data/mysql/4-nuclear_power_plants.sql @@ -28,7 +28,7 @@ CREATE TABLE `nuclear_power_plants` ( CONSTRAINT `fk_nuclear_power_plants_countries_code` FOREIGN KEY (`country_code`) REFERENCES `countries` (`code`), CONSTRAINT `fk_nuclear_power_plants_nuclear_reactor_type_id` FOREIGN KEY (`reactor_type_id`) REFERENCES `nuclear_reactor_type` (`id`), CONSTRAINT `fk_nuclear_power_plants_status_type_id` FOREIGN KEY (`status_id`) REFERENCES `nuclear_power_plant_status_type` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=803 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='GeoNuclearData\r\n\r\n# https://github.com/cristianst85/GeoNuclearData\r\n\r\nVERSION\r\n\r\n# Database version: 0.17.0 (2020/04/19)\r\n# Dataset last updated in version: 0.17.6 (2021/04/20)\r\n\r\nCHANGELOG\r\n\r\n# For full changelog see:\r\n# https://github.com/cristianst85/GeoNuclearData/blob/master/CHANGELOG.md\r\n\r\nLICENSE\r\n\r\n# Copyright (C) 2015-2021, Cristian Stoica.\r\n#\r\n# The GeoNuclearData database is made available under the\r\n# Open Database License whose full text can be found at\r\n# https://opendatacommons.org/licenses/odbl/1.0/.\r\n#\r\n# Any rights in individual contents of the database are licensed\r\n# under the Database Contents License whose full text can be\r\n# found at https://opendatacommons.org/licenses/dbcl/1.0/. \r\n\r\n'; +) ENGINE=InnoDB AUTO_INCREMENT=803 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='GeoNuclearData\r\n\r\n# https://github.com/cristianst85/GeoNuclearData\r\n\r\nVERSION\r\n\r\n# Database version: 0.17.0 (2020/04/19)\r\n# Dataset last updated in version: 0.17.7 (2021/04/30)\r\n\r\nCHANGELOG\r\n\r\n# For full changelog see:\r\n# https://github.com/cristianst85/GeoNuclearData/blob/master/CHANGELOG.md\r\n\r\nLICENSE\r\n\r\n# Copyright (C) 2015-2021, Cristian Stoica.\r\n#\r\n# The GeoNuclearData database is made available under the\r\n# Open Database License whose full text can be found at\r\n# https://opendatacommons.org/licenses/odbl/1.0/.\r\n#\r\n# Any rights in individual contents of the database are licensed\r\n# under the Database Contents License whose full text can be\r\n# found at https://opendatacommons.org/licenses/dbcl/1.0/. \r\n\r\n'; -- ---------------------------- -- Records of nuclear_power_plants @@ -457,7 +457,7 @@ INSERT INTO `nuclear_power_plants` VALUES ('422', 'LaSalle-2', '41.246000', '-88 INSERT INTO `nuclear_power_plants` VALUES ('423', 'Latina', '41.427000', '12.808000', 'IT', '5', '8', 'MAGNOX', '1958-11-01', '1964-01-01', '1987-12-01', '200', 'WNA/IAEA', '2015-05-24 04:51:26', '318'); INSERT INTO `nuclear_power_plants` VALUES ('424', 'Leibstadt', '47.601000', '8.183000', 'CH', '3', '5', 'BWR-6', '1974-01-01', '1984-12-15', null, '960', 'WNA/IAEA', '2015-05-24 04:50:39', '59'); INSERT INTO `nuclear_power_plants` VALUES ('425', 'Leningrad 2-1', '59.837000', '29.039000', 'RU', '3', '21', 'VVER V-491', '2008-10-25', '2018-10-29', null, '1066', 'WNA/IAEA', '2019-11-22 00:00:00', '900'); -INSERT INTO `nuclear_power_plants` VALUES ('426', 'Leningrad 2-2', '59.837000', '29.039000', 'RU', '3', '21', 'VVER V-491', '2010-04-15', null, null, '1066', 'WNA/IAEA', '2021-01-06 01:19:47', '901'); +INSERT INTO `nuclear_power_plants` VALUES ('426', 'Leningrad 2-2', '59.837000', '29.039000', 'RU', '3', '21', 'VVER V-491', '2010-04-15', '2021-03-18', null, '1066', 'WNA/IAEA', '2021-04-30 21:49:18', '901'); INSERT INTO `nuclear_power_plants` VALUES ('427', 'Leningrad 2-3', '59.837000', '29.039000', 'RU', '1', '21', 'VVER V-491', null, null, null, '1085', 'Wikipedia', null, null); INSERT INTO `nuclear_power_plants` VALUES ('428', 'Leningrad 2-4', '59.837000', '29.039000', 'RU', '1', '21', 'VVER V-491', null, null, null, '1085', 'Wikipedia', null, null); INSERT INTO `nuclear_power_plants` VALUES ('429', 'Leningrad-1', '59.837000', '29.039000', 'RU', '5', '17', 'RBMK-1000', '1970-03-01', '1974-11-01', '2018-12-22', '925', 'WNA/IAEA', '2019-06-02 20:19:08', '474'); @@ -809,7 +809,7 @@ INSERT INTO `nuclear_power_plants` VALUES ('789', 'Kursk 2-2', '51.674000', '35. INSERT INTO `nuclear_power_plants` VALUES ('790', 'Taipingling-1', '22.693056', '114.983333', 'CN', '2', '21', 'HPR1000', '2019-12-26', null, null, '1116', 'IAEA', '2020-06-06 02:41:28', '1084'); INSERT INTO `nuclear_power_plants` VALUES ('791', 'Zhangzhou-2', '23.829167', '117.491667', 'CN', '2', '21', 'HPR-1000', '2020-09-04', null, null, '1126', 'IAEA/Wikipedia', '2021-01-09 20:00:00', '1090'); INSERT INTO `nuclear_power_plants` VALUES ('792', 'Taipingling-2', '22.693056', '114.983333', 'CN', '2', '21', 'HPR1000', '2020-10-15', null, null, '1116', 'IAEA', '2021-01-09 17:57:48', '1091'); -INSERT INTO `nuclear_power_plants` VALUES ('793', 'Xiapu-1', '26.803611', '120.155000', 'CN', '2', '7', 'CFR-600', '2017-12-29', null, null, '600', 'WNA/Wikipedia', '2021-02-14 00:08:00', null); +INSERT INTO `nuclear_power_plants` VALUES ('793', 'Xiapu-1', '26.803611', '120.155000', 'CN', '2', '7', 'CFR600', '2017-12-29', null, null, '642', 'WNA/Wikipedia/IAEA', '2021-04-30 21:49:18', '1101'); INSERT INTO `nuclear_power_plants` VALUES ('794', 'Xiapu-2', '26.803611', '120.155000', 'CN', '2', '7', 'CFR-600', '2020-12-27', null, null, '600', 'WNA/Wikipedia', '2021-02-14 00:09:00', null); INSERT INTO `nuclear_power_plants` VALUES ('795', 'Cernavoda-4', '44.322000', '28.061000', 'RO', '8', '20', null, '1985-08-15', null, null, '655', 'IAEA/Wikipedia', '2021-02-14 01:00:00', null); INSERT INTO `nuclear_power_plants` VALUES ('796', 'Cernavoda-5', '44.322000', '28.061000', 'RO', '9', '20', null, '1987-05-12', null, null, '655', 'IAEA/Wikipedia', '2021-02-14 01:01:00', null);