diff --git a/src/app/assets/floodZonesAssets/PinIntransitavel.js b/src/app/assets/floodZonesAssets/PinIntransitavel.js
index f571b92..7b2f33d 100644
--- a/src/app/assets/floodZonesAssets/PinIntransitavel.js
+++ b/src/app/assets/floodZonesAssets/PinIntransitavel.js
@@ -1 +1 @@
-export default PinIntransitavel = ``
\ No newline at end of file
+export default PinIntransitavel = ``
\ No newline at end of file
diff --git a/src/app/assets/floodZonesAssets/PinTransitavel.js b/src/app/assets/floodZonesAssets/PinTransitavel.js
index 68ddedd..3ee9d1f 100644
--- a/src/app/assets/floodZonesAssets/PinTransitavel.js
+++ b/src/app/assets/floodZonesAssets/PinTransitavel.js
@@ -1 +1 @@
-export default PinTransitavel = ``
\ No newline at end of file
+export default PinTransitavel = ``
\ No newline at end of file
diff --git a/src/app/assets/pluviometer/PinPluviometerOfficial.js b/src/app/assets/pluviometer/PinPluviometerOfficial.js
new file mode 100644
index 0000000..df7602e
--- /dev/null
+++ b/src/app/assets/pluviometer/PinPluviometerOfficial.js
@@ -0,0 +1 @@
+export default PinPluviometerOfficial = ``
\ No newline at end of file
diff --git a/src/app/assets/pluviometer/PinPluviometroArt.js b/src/app/assets/pluviometer/PinPluviometroArt.js
index cd29e07..72c3bf6 100644
--- a/src/app/assets/pluviometer/PinPluviometroArt.js
+++ b/src/app/assets/pluviometer/PinPluviometroArt.js
@@ -1 +1 @@
-export default PinPluviometroArt = ``
\ No newline at end of file
+export default PinPluviometroArt = ``
\ No newline at end of file
diff --git a/src/app/assets/rain/PinChuvaForte.js b/src/app/assets/rain/PinChuvaForte.js
index 10a7a38..3777c72 100644
--- a/src/app/assets/rain/PinChuvaForte.js
+++ b/src/app/assets/rain/PinChuvaForte.js
@@ -1 +1 @@
-export default PinChuvaForte = ``
\ No newline at end of file
+export default PinChuvaForte = ``
\ No newline at end of file
diff --git a/src/app/assets/rain/PinChuvaFraca.js b/src/app/assets/rain/PinChuvaFraca.js
index 47c2cbb..7c121e5 100644
--- a/src/app/assets/rain/PinChuvaFraca.js
+++ b/src/app/assets/rain/PinChuvaFraca.js
@@ -1 +1 @@
-export default PinChuvaFraca = ``
\ No newline at end of file
+export default PinChuvaFraca = ``
\ No newline at end of file
diff --git a/src/app/assets/rain/PinChuvaModerada.js b/src/app/assets/rain/PinChuvaModerada.js
index 445a34c..7ea219c 100644
--- a/src/app/assets/rain/PinChuvaModerada.js
+++ b/src/app/assets/rain/PinChuvaModerada.js
@@ -1 +1 @@
-export default PinChuvaModerada = ``
\ No newline at end of file
+export default PinChuvaModerada = ``
\ No newline at end of file
diff --git a/src/app/assets/rain/PinNublado.js b/src/app/assets/rain/PinNublado.js
index 5f3aa97..dd3656f 100644
--- a/src/app/assets/rain/PinNublado.js
+++ b/src/app/assets/rain/PinNublado.js
@@ -1 +1 @@
-export default PinNublado = ``
\ No newline at end of file
+export default PinNublado = ``
\ No newline at end of file
diff --git a/src/app/assets/river/PinRioCheio.js b/src/app/assets/river/PinRioCheio.js
index 6c038f9..724e1b8 100644
--- a/src/app/assets/river/PinRioCheio.js
+++ b/src/app/assets/river/PinRioCheio.js
@@ -1 +1 @@
-export default PinRioCheio = ``
\ No newline at end of file
+export default PinRioCheio = ``
\ No newline at end of file
diff --git a/src/app/assets/river/PinRioExtravasado.js b/src/app/assets/river/PinRioExtravasado.js
index 9b9afcb..ca371b5 100644
--- a/src/app/assets/river/PinRioExtravasado.js
+++ b/src/app/assets/river/PinRioExtravasado.js
@@ -1 +1 @@
-export default PinRioExtravasado = ``
\ No newline at end of file
+export default PinRioExtravasado = ``
\ No newline at end of file
diff --git a/src/app/assets/river/PinRioNormal.js b/src/app/assets/river/PinRioNormal.js
index a46c9d7..02feda8 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/config/assets.js b/src/app/config/assets.js
index 80b6363..e4f347b 100644
--- a/src/app/config/assets.js
+++ b/src/app/config/assets.js
@@ -35,6 +35,7 @@ import PinPluviometroArt from "../assets/pluviometer/PinPluviometroArt";
import FloodPassable from "../assets/floodZonesAssets/passable.svg";
import FloodNotPassable from "../assets/floodZonesAssets/not_passable.svg";
+import PinPluviometerOfficial from "../assets/pluviometer/PinPluviometerOfficial";
export default {
floodZones: {
@@ -91,7 +92,7 @@ export default {
pluviometer: require("../assets/pluviometer/diario_pluviometrico.png"),
pluviometer_pin: PinPluviometroArt,
officialPluviometer: require("../assets/pluviometer/pluviometroOficial.png"),
- officialPluviometer_pin: require("../assets/pluviometer/PinPluviometroOficial.png"),
+ officialPluviometer_pin: PinPluviometerOfficial,
PluviometerIcon: Pluviometer,
OfficialPluviometer: OfficialPluviometer,
AppLogoTitle: AppLogoTitle,
diff --git a/src/app/hooks/useFiltering.js b/src/app/hooks/useFiltering.js
index 6bd0ef5..cef1f2f 100644
--- a/src/app/hooks/useFiltering.js
+++ b/src/app/hooks/useFiltering.js
@@ -1,28 +1,29 @@
import moment from "moment";
function useFiltering(location) {
- const initialDate = moment().format("YYYY-MM-DDTHH:mm:ss");
+ const initialDate = moment().add(1, "days").format("YYYY-MM-DDTHH:mm:ss");
const finalDate = moment().subtract(1, "days").format("YYYY-MM-DDTHH:mm:ss");
+ // console.log(initialDate+"/"+finalDate);
const filters = [
{
name: "floodZones",
socketUrl: new WebSocket(
- "wss://waterproofing.geog.uni-heidelberg.de/wss/hot/formsanswers?" +
+ "wss://waterproofing.geog.uni-heidelberg.de/wss/hot/data?" +
`type=FLOODZONES_FORM&time=${finalDate}/${initialDate}&lat=${location.lat}&lon=${location.long}&buffer=5000&limit=5`
),
},
{
name: "rain",
socketUrl: new WebSocket(
- "wss://waterproofing.geog.uni-heidelberg.de/wss/hot/formsanswers?" +
+ "wss://waterproofing.geog.uni-heidelberg.de/wss/hot/data?" +
`type=RAIN_FORM&time=${finalDate}/${initialDate}&lat=${location.lat}&lon=${location.long}&buffer=50000&limit=30`
),
},
{
name: "riverFlood",
socketUrl: new WebSocket(
- "wss://waterproofing.geog.uni-heidelberg.de/wss/hot/formsanswers?" +
+ "wss://waterproofing.geog.uni-heidelberg.de/wss/hot/data?" +
`type=RIVERFLOOD_FORM&time=${finalDate}/${initialDate}&lat=${location.lat}&lon=${location.long}&buffer=50000&limit=5`
),
},
diff --git a/src/app/hooks/useSocketMarkers.js b/src/app/hooks/useSocketMarkers.js
index 5fddfcf..801cd33 100644
--- a/src/app/hooks/useSocketMarkers.js
+++ b/src/app/hooks/useSocketMarkers.js
@@ -17,7 +17,7 @@ const custom_assets = {
const custom_assets_pin = {
pluviometer: assets.pluviometer_pin,
- officialPluviometer: assets.pluviometer_pin,//assets.officialPluviometer_pin,
+ officialPluviometer: assets.officialPluviometer_pin,
floodZones: {
passable: PinTransitavel,
not_passable: PinIntransitavel,
@@ -157,26 +157,22 @@ function buildMarkerObject(response, name) {
const r = JSON.parse(response);
const resposta = r.formsanswersgeom;
const formsanswersgeom = JSON.parse(resposta).coordinates;
-
var situation = null;
- if (r.fias) {
- r.fias.forEach(function (f) {
- if (f.fieldname == "situation") {
- situation = f.fieldsanswersvalue;
- }
- });
+ if (r.array_to_json) {
+ situation = r.array_to_json.find((field)=> field.fieldname == "situation");
}
+// console.log(situation.fieldsanswersvalue);
return {
ID: r.formsanswersid,
name: name,
- title: situation,
+ title: situation ? situation.fieldsanswersvalue : null,
coordinate: {
latitude: formsanswersgeom[1],
longitude: formsanswersgeom[0],
},
- image: getImage(name, situation),
+ image: getImage(name, situation ? situation.fieldsanswersvalue : null),
};
}
diff --git a/src/app/screens/MapFeedScreen.js b/src/app/screens/MapFeedScreen.js
index 553ebe0..3707d2f 100644
--- a/src/app/screens/MapFeedScreen.js
+++ b/src/app/screens/MapFeedScreen.js
@@ -17,10 +17,10 @@ export default function MapFeedScreen(props) {
susceptibilityAreas: false,
},
citzen: {
- floodRisk: false,
- pluviometer: false,
+ floodRisk: true,
+ pluviometer: true,
rain: false,
- floodZones: false,
+ floodZones: true,
riverFlood: false,
},
});