diff --git a/src/app/components/MapDataMenu.js b/src/app/components/MapDataMenu.js
index b927217..d1d4d4a 100644
--- a/src/app/components/MapDataMenu.js
+++ b/src/app/components/MapDataMenu.js
@@ -92,7 +92,7 @@ function DataOriginSelector({ dataOriginToShow, setDataOriginToShow }) {
);
}
-// FIXME: Change icon values in the future
+// FIXME: Change icon values in the future
const dataOptions = {
oficial: [
{
@@ -146,24 +146,34 @@ function Border() {
return (
);
}
-function ListDataOptions(dataOptionsToShow, dataOriginToShow, setDataOptionsToShow, option) {
+function ListDataOptions(
+ dataOptionsToShow,
+ dataOriginToShow,
+ setDataOptionsToShow,
+ option
+) {
const item = dataOptionsToShow[dataOriginToShow][option.code];
- const dataOptionObject = {...dataOptionsToShow, [dataOriginToShow]: {...dataOptionsToShow[dataOriginToShow], [option.code]: !item}};
-
+ const dataOptionObject = {
+ ...dataOptionsToShow,
+ [dataOriginToShow]: {
+ ...dataOptionsToShow[dataOriginToShow],
+ [option.code]: !item,
+ },
+ };
return (
-
+
-
{setDataOptionsToShow(dataOptionObject)}}
+ onPress={() => {
+ setDataOptionsToShow(dataOptionObject);
+ }}
>
-
- {item ? "ADICIONAR" : "REMOVER"}
-
+ {item ? "ADICIONAR" : "REMOVER"}
@@ -222,13 +231,32 @@ function ListDataOptions(dataOptionsToShow, dataOriginToShow, setDataOptionsToSh
);
}
-function DataOriginOptions({ dataOriginToShow, dataOptionsToShow, setDataOptionsToShow }) {
+function DataOriginOptions({
+ dataOriginToShow,
+ dataOptionsToShow,
+ setDataOptionsToShow,
+}) {
return (
-
-
+
+
+
{dataOptions[dataOriginToShow].map((option) =>
- ListDataOptions(dataOptionsToShow, dataOriginToShow, setDataOptionsToShow, option)
+ ListDataOptions(
+ dataOptionsToShow,
+ dataOriginToShow,
+ setDataOptionsToShow,
+ option
+ )
)}
+
);
@@ -249,13 +277,10 @@ function DataMenuBody({ setShowModal }) {
riverFlood: true,
},
});
- console.log(dataOptionsToShow)
+
return (
setShowModal()}
+ >
+
+ VISUALIZAR DADOS NO MAPA
+
+
+ );
+}
+
export default function MapDataMenu(props) {
const [showModal, setShowModal] = useState(null);
return (
-
-
@@ -23,12 +23,12 @@ const styles = StyleSheet.create({
alignItems: "center",
backgroundColor: colors.primary,
borderColor: colors.white,
- borderRadius: 40,
- borderWidth: 10,
- bottom: 20,
- height: 80,
+ borderRadius: 50,
+ borderWidth: 0,
+ bottom: -4,
+ height: 40,
justifyContent: "center",
- width: 80,
+ width: 40,
},
});
diff --git a/src/app/screens/MapFormScreen.js b/src/app/screens/MapFormScreen.js
index 6c13642..508c40d 100644
--- a/src/app/screens/MapFormScreen.js
+++ b/src/app/screens/MapFormScreen.js
@@ -51,6 +51,7 @@ const MapFormScreen = (props) => {
moveLocation(e)}
centerUserLocation={true}
+ isForm={true}
/>