Merge branch 'master' into master

electricitymaps · Jan 12, 2025 · e61bc27 · e61bc27
2 parents 0ac3c7e + 5c68e5a
commit e61bc27
Show file tree

Hide file tree

Showing 92 changed files with 2,661 additions and 2,718 deletions.
diff --git a/mockserver/generate_mock_data.js b/mockserver/generate_mock_data.js
@@ -2,7 +2,7 @@ const axios = require('axios');
 const fs = require('fs');
 
 // API Version
-const API_VERSION = 'v9';
+const API_VERSION = 'v10';
 
 const writeJSON = (fileName, obj, encoding = 'utf8') =>
   fs.writeFileSync(fileName, JSON.stringify(obj), encoding);
@@ -16,7 +16,7 @@ const fetchAndStoreData = async (url, savePath) => {
 };
 
 const CORE_URL = `http://localhost:8001/${API_VERSION}`;
-const timeAggregates = ['hourly', 'hourly_72', 'daily', 'monthly', 'yearly'];
+const timeAggregates = ['hourly', 'daily', 'monthly', 'yearly'];
 const detailsZones = ['DE', 'DK-DK2'];
 
 const generateMockData = async () => {

diff --git a/mockserver/public/v10/details/daily/DE.json b/mockserver/public/v10/details/daily/DE.json
diff --git a/mockserver/public/v10/details/daily/DK-DK2.json b/mockserver/public/v10/details/daily/DK-DK2.json