Update for RISE specific content

cgs-earth · Jul 15, 2024 · 15b096e · 15b096e
1 parent 7b06d4e
commit 15b096e
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 27 deletions.
diff --git 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
diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png
diff --git a/src/components/app/AppHeader.vue b/src/components/app/AppHeader.vue
@@ -6,7 +6,7 @@
         <v-responsive width="90%" max-width="1130" height="100%" class="mx-auto">
           <v-container fluid>
             <v-row fill-height>
-              <a :href="wqp" title="hub2box">
+              <a :href="provider" title="hub2box">
                 <img :src="logo" class="pl-6 my-3" />
               </a>
               <v-spacer />
@@ -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
@@ -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
@@ -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
@@ -33,18 +33,27 @@
                   <wis-station :features="features" :map="map" />
                 </template>
                 <l-tile-layer :url="url" :attribution="attribution" />
-                <l-control position="bottomright">
-                  <v-card class="legend pa-2" border="1" width="120">
-                    <p class="text-subtitle-2">{{ $t("station.type") }}</p>
-                    <v-row no-gutters justify="center" align="center" v-for="(item, i) in legend" :key="i">
-                      <v-divider />
-                      <v-col cols="2" offset="1">
-                        <i class="dot pl-1 mt-1" :style="`background: ${item.color}`"> </i>
-                      </v-col>
-                      <v-col class="py-1">
-                        {{ item.type }}
-                      </v-col>
-                    </v-row>
+                <l-control position="topleft">
+                  <v-card class="legend" width="200">
+                    <v-expansion-panels>
+                      <v-expansion-panel>
+                        <v-expansion-panel-title>
+                          <v-icon class="pr-2" icon="mdi-map-legend" />
+                          {{ $t('station.type') }} 
+                        </v-expansion-panel-title>
+                        <v-expansion-panel-text>
+                          <v-row no-gutters justify="center" align="center" v-for="(item, i) in legend" :key="i">
+                            <v-divider v-if="i !== 0" />
+                            <v-col cols="2" offset="1">
+                              <i class="dot pl-1 mt-1" :style="`background: ${item.color}`"> </i>
+                            </v-col>
+                            <v-col class="py-1">
+                              {{ item.type }}
+                            </v-col>
+                          </v-row>
+                        </v-expansion-panel-text>
+                      </v-expansion-panel>
+                    </v-expansion-panels>
                   </v-card>
                 </l-control>
               </l-map>
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,7 @@
     "services": "Services de données",
     "data": "Données",
     "documentation": "Documentation",
-    "wqie": "WQIE"
+    "rise": "RISE API"
   },
   "util": {
     "token": "Jeton",