diff --git a/src/app/assets/floodZonesAssets/not_passable_icon.png b/src/app/assets/floodZonesAssets/not_passable_icon.png index 0b172d3..d742838 100644 Binary files a/src/app/assets/floodZonesAssets/not_passable_icon.png and b/src/app/assets/floodZonesAssets/not_passable_icon.png differ diff --git a/src/app/assets/floodZonesAssets/passable_icon.png b/src/app/assets/floodZonesAssets/passable_icon.png index b92f4e3..16d8092 100644 Binary files a/src/app/assets/floodZonesAssets/passable_icon.png and b/src/app/assets/floodZonesAssets/passable_icon.png differ diff --git a/src/app/assets/pluviometer/PluviometroOficial.svg b/src/app/assets/pluviometer/PluviometroOficial.svg new file mode 100644 index 0000000..4e4d215 --- /dev/null +++ b/src/app/assets/pluviometer/PluviometroOficial.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/app/assets/pluviometer/diario_pluviometrico.png b/src/app/assets/pluviometer/diario_pluviometrico.png index abcf599..f03fcda 100644 Binary files a/src/app/assets/pluviometer/diario_pluviometrico.png and b/src/app/assets/pluviometer/diario_pluviometrico.png differ diff --git a/src/app/assets/pluviometer/pluviometroOficial.png b/src/app/assets/pluviometer/pluviometroOficial.png new file mode 100644 index 0000000..02d5ba1 Binary files /dev/null and b/src/app/assets/pluviometer/pluviometroOficial.png differ diff --git a/src/app/assets/rain/chuva_forte.png b/src/app/assets/rain/chuva_forte.png index 234562f..8db5ae9 100644 Binary files a/src/app/assets/rain/chuva_forte.png and b/src/app/assets/rain/chuva_forte.png differ diff --git a/src/app/assets/rain/chuva_fraca.png b/src/app/assets/rain/chuva_fraca.png index f514f6b..f39e1e5 100644 Binary files a/src/app/assets/rain/chuva_fraca.png and b/src/app/assets/rain/chuva_fraca.png differ diff --git a/src/app/assets/rain/chuva_logo.png b/src/app/assets/rain/chuva_logo.png index 63d4f77..b2fe5c4 100644 Binary files a/src/app/assets/rain/chuva_logo.png and b/src/app/assets/rain/chuva_logo.png differ diff --git a/src/app/assets/rain/chuva_muito_forte.png b/src/app/assets/rain/chuva_muito_forte.png index a17e6f4..5e6229f 100644 Binary files a/src/app/assets/rain/chuva_muito_forte.png and b/src/app/assets/rain/chuva_muito_forte.png differ diff --git a/src/app/assets/rain/sem_chuva.png b/src/app/assets/rain/sem_chuva.png index 262a879..0e98c2c 100644 Binary files a/src/app/assets/rain/sem_chuva.png and b/src/app/assets/rain/sem_chuva.png differ diff --git a/src/app/assets/river/rio_alto.png b/src/app/assets/river/rio_alto.png index 30dc210..3de6740 100644 Binary files a/src/app/assets/river/rio_alto.png and b/src/app/assets/river/rio_alto.png differ diff --git a/src/app/assets/river/rio_baixo.png b/src/app/assets/river/rio_baixo.png index 44873d3..cd421ab 100644 Binary files a/src/app/assets/river/rio_baixo.png and b/src/app/assets/river/rio_baixo.png differ diff --git a/src/app/assets/river/rio_normal.png b/src/app/assets/river/rio_normal.png index 3f29add..6a1ce7f 100644 Binary files a/src/app/assets/river/rio_normal.png and b/src/app/assets/river/rio_normal.png differ diff --git a/src/app/assets/river/rio_transbordando.png b/src/app/assets/river/rio_transbordando.png index 2336c08..9c15752 100644 Binary files a/src/app/assets/river/rio_transbordando.png and b/src/app/assets/river/rio_transbordando.png differ diff --git a/src/app/components/MapModal.js b/src/app/components/MapModal.js index 1200d0e..3c7e0ab 100644 --- a/src/app/components/MapModal.js +++ b/src/app/components/MapModal.js @@ -220,7 +220,7 @@ function MapModal(props) { {topBar(props)} {componentBody(props)} {isPluviometer(props.name) ? moreInfo(props) : null} - {isPluviometer(props.name) ? reviews(props) : null} + {!isPluviometer(props.name) ? reviews(props) : null} ); } diff --git a/src/app/config/assets.js b/src/app/config/assets.js index 767fc1c..c65fbd0 100644 --- a/src/app/config/assets.js +++ b/src/app/config/assets.js @@ -71,7 +71,7 @@ export default { Rain_1_5: RainLow, Rain_1_5_Toggle: RainLowToggle, - rain_2_5: require("../assets/rain/chuva_peq.png"), + rain_2_5: require("../assets/rain/chuva_logo.png"), Rain_2_5: RainMedium, Rain_2_5_Toggle: RainMediumToggle, @@ -94,6 +94,7 @@ export default { Weather_5_clean, ], pluviometer: require("../assets/pluviometer/diario_pluviometrico.png"), + officialPluviometer: require("../assets/pluviometer/pluviometroOficial.png"), PluviometerIcon: Pluviometer, AppLogoTitle: AppLogoTitle, }; diff --git a/src/app/hooks/selectFromDB.js b/src/app/hooks/selectFromDB.js index 3d4547c..0d14ecb 100644 --- a/src/app/hooks/selectFromDB.js +++ b/src/app/hooks/selectFromDB.js @@ -6,6 +6,7 @@ import assets from "../config/assets"; const custom_assets = { pluviometer: assets.pluviometer, + officialPluviometer: assets.officialPluviometer, floodZones: assets.floodZones, riverLevel: ["low", "normal", "high", "flooding"].map((key) => { return assets.riverLevel[key]; @@ -208,7 +209,7 @@ function buildRandonData(location, addr) { return points.map((points) => { return { - image: custom_assets.pluviometer, + image: custom_assets.officialPluviometer, ID: ++ID, name: "officialPluviometer", title: "Pluviometro Oficial " + i++,