Skip to content

Commit

Permalink
update to v4 dev data
Browse files Browse the repository at this point in the history
  • Loading branch information
chienleng committed Jul 25, 2024
1 parent 8633433 commit 1acc545
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
3 changes: 2 additions & 1 deletion pages/facilities/_region/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,8 @@ export default {
}),
fetchData() {
const urls = []
urls.push('/v3/geo/au_facilities.json')
const version = 'v3'
urls.push(`/${version}/geo/au_facilities.json`)
if (urls.length > 0) {
Http(urls)
Expand Down
24 changes: 13 additions & 11 deletions services/Data.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import subYears from 'date-fns/subYears'
import * as rangesJs from '~/constants/ranges.js'
import { INTERVAL_5MIN, INTERVAL_30MIN } from '~/constants/interval-filters.js'

const version = 'v4'

function getYearPaths(prepend, regionId, oneYearAgo) {
const today = new Date()
const thisFullYear = today.getFullYear()
Expand All @@ -14,12 +16,12 @@ function getYearPaths(prepend, regionId, oneYearAgo) {
const is1Jan = thisDate === 1 && thisMonth === 0

if (thisFullYear !== oneYearAgo) {
paths.push(`v3/stats/au${prepend}/${regionId}/energy/${oneYearAgo}.json`)
paths.push(`${version}/stats/au${prepend}/${regionId}/energy/${oneYearAgo}.json`)
}

// check it's not 1/1/yyyy since the new year won't be generated yet
if (!is1Jan) {
paths.push(`v3/stats/au${prepend}/${regionId}/energy/${thisFullYear}.json`)
paths.push(`${version}/stats/au${prepend}/${regionId}/energy/${thisFullYear}.json`)
}

return paths
Expand All @@ -37,17 +39,17 @@ export default {
case rangesJs.RANGE_1D:
case rangesJs.RANGE_3D:
case rangesJs.RANGE_7D:
urls.push(`v3/stats/au${prepend}/${regionId}/power/7d.json`)
urls.push(`${version}/stats/au${prepend}/${regionId}/power/7d.json`)
break

case rangesJs.RANGE_14D:
case rangesJs.RANGE_28D:
urls.push(`v3/stats/au${prepend}/${regionId}/power/30d.json`)
urls.push(`${version}/stats/au${prepend}/${regionId}/power/30d.json`)
break

case rangesJs.RANGE_30D:
if (interval === INTERVAL_5MIN || interval === INTERVAL_30MIN) {
urls.push(`v3/stats/au${prepend}/${regionId}/power/30d.json`)
urls.push(`${version}/stats/au${prepend}/${regionId}/power/30d.json`)
} else {
const thirtyDaysAgo = subDays(new Date(), 30)
oneYearAgo = thirtyDaysAgo.getFullYear()
Expand All @@ -62,7 +64,7 @@ export default {

case rangesJs.RANGE_ALL:
case rangesJs.RANGE_ALL_12MTH_ROLLING:
urls.push(`v3/stats/au${prepend}/${regionId}/energy/all.json`)
urls.push(`${version}/stats/au${prepend}/${regionId}/energy/all.json`)
break
default:
}
Expand All @@ -79,29 +81,29 @@ export default {
case rangesJs.RANGE_7D:
case rangesJs.RANGE_14D:
case rangesJs.RANGE_28D:
urls.push(`v3/stats/au${prepend}/${regionId}/power/30d.json`)
urls.push(`${version}/stats/au${prepend}/${regionId}/power/30d.json`)
break
default:
}
return urls
},

getYearDailyPath(region, year, useV3Paths) {
getYearDailyPath(region, year, usePaths) {
const prepend =
region === 'wem' || region === 'nem' || region === 'au' ? '' : '/NEM'
const regionId = region.toUpperCase()

return `v3/stats/au${prepend}/${regionId}/energy/${year}.json`
return `${version}/stats/au${prepend}/${regionId}/energy/${year}.json`
},

getRegionAllDailyPath(region) {
// const prepend =
// region === 'wem' || region === 'nem' || region === 'au' ? '' : '/NEM'
const regionId = region.toUpperCase()
return `v3/stats/au/${regionId}/daily.json`
return `${version}/stats/au/${regionId}/daily.json`
},

getAllMonthlyPath() {
return 'v3/stats/au/all/monthly.json'
return '${version}/stats/au/all/monthly.json'
}
}

0 comments on commit 1acc545

Please sign in to comment.