diff --git a/src/app/assets/floodZonesAssets/not_passable.svg b/src/app/assets/floodZonesAssets/not_passable.svg
index de5fbb0..009e5d8 100644
--- a/src/app/assets/floodZonesAssets/not_passable.svg
+++ b/src/app/assets/floodZonesAssets/not_passable.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/assets/floodZonesAssets/passable.svg b/src/app/assets/floodZonesAssets/passable.svg
index e335bb6..1e147a7 100644
--- a/src/app/assets/floodZonesAssets/passable.svg
+++ b/src/app/assets/floodZonesAssets/passable.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/assets/pluviometer/PluviometroOficial.svg b/src/app/assets/pluviometer/PluviometroOficial.svg
index 876af93..16f629b 100644
--- a/src/app/assets/pluviometer/PluviometroOficial.svg
+++ b/src/app/assets/pluviometer/PluviometroOficial.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/assets/rain/chuva_forte.svg b/src/app/assets/rain/chuva_forte.svg
index 3735ddc..444d89a 100644
--- a/src/app/assets/rain/chuva_forte.svg
+++ b/src/app/assets/rain/chuva_forte.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/assets/rain/chuva_fraca.svg b/src/app/assets/rain/chuva_fraca.svg
index a874f0d..d084f96 100644
--- a/src/app/assets/rain/chuva_fraca.svg
+++ b/src/app/assets/rain/chuva_fraca.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/assets/rain/chuva_moderada.svg b/src/app/assets/rain/chuva_moderada.svg
index a86a788..0697a05 100644
--- a/src/app/assets/rain/chuva_moderada.svg
+++ b/src/app/assets/rain/chuva_moderada.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/assets/rain/sem_chuva.svg b/src/app/assets/rain/sem_chuva.svg
index 928c54c..2b0dae2 100644
--- a/src/app/assets/rain/sem_chuva.svg
+++ b/src/app/assets/rain/sem_chuva.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/assets/river/PinRioBaixo.js b/src/app/assets/river/PinRioBaixo.js
index 75b35f5..2393a39 100644
--- a/src/app/assets/river/PinRioBaixo.js
+++ b/src/app/assets/river/PinRioBaixo.js
@@ -1 +1 @@
-export default PinRioBaixo = ``
\ No newline at end of file
+export default PinRioBaixo = ``
\ No newline at end of file
diff --git a/src/app/assets/river/PinRioNormal.js b/src/app/assets/river/PinRioNormal.js
index 02feda8..7661f02 100644
--- a/src/app/assets/river/PinRioNormal.js
+++ b/src/app/assets/river/PinRioNormal.js
@@ -1 +1 @@
-export default PinRioNormal = ``
\ No newline at end of file
+export default PinRioNormal = ``
\ No newline at end of file
diff --git a/src/app/assets/river/river_extravasado.svg b/src/app/assets/river/river_extravasado.svg
index ee450ae..af546ac 100644
--- a/src/app/assets/river/river_extravasado.svg
+++ b/src/app/assets/river/river_extravasado.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/assets/river/river_high.svg b/src/app/assets/river/river_high.svg
index 13028dc..8e26882 100644
--- a/src/app/assets/river/river_high.svg
+++ b/src/app/assets/river/river_high.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/assets/river/river_low.svg b/src/app/assets/river/river_low.svg
index ba2e40c..b171a34 100644
--- a/src/app/assets/river/river_low.svg
+++ b/src/app/assets/river/river_low.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/assets/river/river_normal.svg b/src/app/assets/river/river_normal.svg
index 4d7ce25..954ad00 100644
--- a/src/app/assets/river/river_normal.svg
+++ b/src/app/assets/river/river_normal.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/components/AssembleModalObject.js b/src/app/components/AssembleModalObject.js
index 979286b..aa1b5a9 100644
--- a/src/app/components/AssembleModalObject.js
+++ b/src/app/components/AssembleModalObject.js
@@ -5,12 +5,12 @@ import assets from "../config/assets";
const custom_assets = {
pluviometer: assets.pluviometer,
- officialPluviometer: assets.officialPluviometer,
+ officialPluviometer: assets.OfficialPluviometer,
floodZones: assets.floodZones,
- riverLevel: ["low", "normal", "high", "flooding"].map((key) => {
+ riverLevel: ["Low", "Normal", "High", "Flooding"].map((key) => {
return assets.riverLevel[key];
}),
- rainLevel: ["rain_0_5", "rain_1_5", "rain_2_5", "rain_3_5"].map((key) => {
+ rainLevel: ["Rain_0_5", "Rain_1_5", "Rain_2_5", "Rain_3_5"].map((key) => {
return assets.rainLevel[key];
}),
};
@@ -51,7 +51,11 @@ function getLogo(name, situation) {
return custom_assets.riverLevel[0];
}
if (name == "floodZones") {
- return custom_assets.floodZones;
+ if (situation == "TRANSITÁVEL") {
+ return custom_assets.floodZones.passable;
+ } else {
+ return custom_assets.floodZones.notPassable;
+ }
}
}
diff --git a/src/app/components/MapModal.js b/src/app/components/MapModal.js
index ab5a5aa..3303f03 100644
--- a/src/app/components/MapModal.js
+++ b/src/app/components/MapModal.js
@@ -5,12 +5,13 @@ import { FontAwesome5 } from "@expo/vector-icons";
import SelfClosingModal from "../components/SelfClosingModal";
import colors from "../config/colors";
import { showMessage } from "react-native-flash-message";
-import { dimensions, screen_height } from "../config/dimensions";
+import { dimensions, scaleDimsFromWidth, screen_height } from "../config/dimensions";
import { Svg, Image as ImageSvg } from "react-native-svg";
import PluviometerGraphics from "./PluviometerGraphics";
import getFieldsAnswers from "../api/RequestFieldsAnswers/getFieldsAnswers";
import AssembleModalObject from "./AssembleModalObject";
import moment from "moment";
+import SvgLabeledButton from "./SvgLabeledButton";
const chartHeight = screen_height * 0.3;
@@ -221,6 +222,8 @@ function moreInfo(props) {
}
function componentBody(props) {
+
+ const dims = scaleDimsFromWidth(95, 95, 16);
// NOTE: This code is refered to our local SQLite solution. Revise this when implement rest API.
const pictures = JSON.parse(props.pictures);
const date = props.date ? props.date : "implementando...";
@@ -232,7 +235,7 @@ function componentBody(props) {
return (
-
+
{!isOfficialPluviometer(props.name) &&
diff --git a/src/app/hooks/useSocketMarkers.js b/src/app/hooks/useSocketMarkers.js
index 801cd33..580fead 100644
--- a/src/app/hooks/useSocketMarkers.js
+++ b/src/app/hooks/useSocketMarkers.js
@@ -74,7 +74,7 @@ function getImage(name, situation) {
return custom_assets_pin.riverLevel[0];
}
if (name == "floodZones") {
- if (situation == "TRANSITAVEL") {
+ if (situation == "TRANSITÁVEL") {
return custom_assets_pin.floodZones.passable;
} else {
return custom_assets_pin.floodZones.not_passable;
@@ -155,6 +155,7 @@ function buildPolygonsObject(response, name) {
function buildMarkerObject(response, name) {
const r = JSON.parse(response);
+ console.log(r);
const resposta = r.formsanswersgeom;
const formsanswersgeom = JSON.parse(resposta).coordinates;
var situation = null;
diff --git a/src/app/screens/MapFeedScreen.js b/src/app/screens/MapFeedScreen.js
index 553ebe0..e17a64e 100644
--- a/src/app/screens/MapFeedScreen.js
+++ b/src/app/screens/MapFeedScreen.js
@@ -17,11 +17,11 @@ export default function MapFeedScreen(props) {
susceptibilityAreas: false,
},
citzen: {
- floodRisk: false,
+ floodRisk: true,
pluviometer: false,
- rain: false,
- floodZones: false,
- riverFlood: false,
+ rain: true,
+ floodZones: true,
+ riverFlood: true,
},
});