diff --git a/.github/workflows/ghcr.yml b/.github/workflows/ghcr.yml index 8fa648e..bf2767e 100644 --- a/.github/workflows/ghcr.yml +++ b/.github/workflows/ghcr.yml @@ -9,6 +9,7 @@ on: push: branches: - main + - rise release: types: [published] @@ -51,6 +52,7 @@ jobs: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | type=raw,value=latest,enable={{is_default_branch}} + type=raw,value=rise type=pep440,pattern={{version}} - name: Build and push diff --git a/public/favicon.ico b/public/favicon.ico index e8f837c..6133f81 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png index b7c0367..5433705 100644 Binary files a/src/assets/img/logo.png and b/src/assets/img/logo.png differ diff --git a/src/components/app/AppHeader.vue b/src/components/app/AppHeader.vue index e0dfc22..036c5d2 100644 --- a/src/components/app/AppHeader.vue +++ b/src/components/app/AppHeader.vue @@ -6,7 +6,7 @@ - + @@ -33,7 +33,7 @@ export default defineComponent({ }, data: function () { return { - wqp: "https://www.waterqualitydata.us/", + provider: "https://www.usbr.gov/", logo: logo, }; }, diff --git a/src/components/app/AppNav.vue b/src/components/app/AppNav.vue index c15b108..2b01fc3 100644 --- a/src/components/app/AppNav.vue +++ b/src/components/app/AppNav.vue @@ -49,9 +49,9 @@ export default defineComponent({ href: undefined, }, { - text: "wqie", + text: "rise", target: undefined, - href: "https://www.ogc.org/initiatives/waterqualityie/", + href: "https://data.usbr.gov/", }, { text: "documentation", diff --git a/src/components/data/DataPlotter.vue b/src/components/data/DataPlotter.vue index e6c3f7e..ca9e373 100644 --- a/src/components/data/DataPlotter.vue +++ b/src/components/data/DataPlotter.vue @@ -49,7 +49,7 @@ export default defineComponent({ x: [], y: [], line: { - color: "#014e9e", + color: "#007396", }, name: "", }, @@ -60,7 +60,7 @@ export default defineComponent({ y: [], marker: { size: 5, - color: "#014e9e", + color: "#007396", }, name: "", }, diff --git a/src/components/leaflet/WisMap.vue b/src/components/leaflet/WisMap.vue index 329f884..455dedf 100644 --- a/src/components/leaflet/WisMap.vue +++ b/src/components/leaflet/WisMap.vue @@ -33,18 +33,27 @@ - - -

{{ $t("station.type") }}

- - - - - - - {{ item.type }} - - + + + + + + + {{ $t('station.type') }} + + + + + + + + + {{ item.type }} + + + + + @@ -93,8 +102,13 @@ export default defineComponent({ attribution: window.VUE_APP_BASEMAP_ATTRIBUTION, url: window.VUE_APP_BASEMAP_URL, legend: [ - { "type": "STORET", "color": "#025da2" }, - { "type": "NWIS", "color": "#ff9800" } + { "type": "Power Plant", "color": "#f44336" }, + { "type": "Power Plant Unit", "color": "#ff9800" }, + { "type": "Building", "color": "#ffeb3b" }, + { "type": "Pump Generating Plant", "color": "#8bc34a" }, + { "type": "Pump Generating Plant Unit", "color": "#009688" }, + { "type": "Lake/Reservoir", "color": "#2196f3" }, + { "type": "River/Stream", "color": "#673ab7" } ] }; }, diff --git a/src/components/station/StationList.vue b/src/components/station/StationList.vue index e41e234..9d12663 100644 --- a/src/components/station/StationList.vue +++ b/src/components/station/StationList.vue @@ -78,10 +78,15 @@ export default defineComponent({ }, getColor(station) { const colors = { - "STORET": "#025da2", - "NWIS": "#ff9800" + "Power Plant": "#f44336", + "Power Plant Unit": "#ff9800", + "Building": "#ffeb3b", + "Pump Generating Plant": "#8bc34a", + "Pump Generating Plant Unit": "#009688", + "Lake/Reservoir": "#2196f3", + "River/Stream": "#673ab7" } - return colors[station.properties.provider]; + return colors[station.properties.type]; }, }, }); diff --git a/src/components/station/WisStation.vue b/src/components/station/WisStation.vue index 6405cb9..ce1c52f 100644 --- a/src/components/station/WisStation.vue +++ b/src/components/station/WisStation.vue @@ -78,12 +78,17 @@ export default defineComponent({ }, pointToLayer(feature, latLng) { const colors = { - "STORET": "#025da2", - "NWIS": "#ff9800" + "Power Plant": "#f44336", + "Power Plant Unit": "#ff9800", + "Building": "#ffeb3b", + "Pump Generating Plant": "#8bc34a", + "Pump Generating Plant Unit": "#009688", + "Lake/Reservoir": "#2196f3", + "River/Stream": "#673ab7" } const markerStyle = { radius: 6, - fillColor: colors[feature.properties.provider], + fillColor: colors[feature.properties.type], color: "#AAAAAA", weight: 1, opacity: 1, diff --git a/src/locales/fr.json b/src/locales/fr.json index 81e35ae..d1bac1d 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -7,7 +7,7 @@ "services": "Services de données", "data": "Données", "documentation": "Documentation", - "wqie": "WQIE" + "rise": "RISE API" }, "util": { "token": "Jeton",