diff --git a/src/.expo-shared/README.md b/src/.expo-shared/README.md
new file mode 100644
index 0000000..e9e5318
--- /dev/null
+++ b/src/.expo-shared/README.md
@@ -0,0 +1,11 @@
+> Why do I have a folder named ".expo-shared" in my project?
+
+The ".expo-shared" folder is created when running commands that produce state that is intended to be shared with all developers on the project. For example, "npx expo-optimize".
+
+> What does the "assets.json" file contain?
+
+The "assets.json" file describes the assets that have been optimized through "expo-optimize" and do not need to be processed again.
+
+> Should I commit the ".expo-shared" folder?
+
+Yes, you should share the ".expo-shared" folder with your collaborators.
diff --git a/src/app.json b/src/app.json
index 281cb0f..67e7221 100644
--- a/src/app.json
+++ b/src/app.json
@@ -33,7 +33,6 @@
"favicon": "./app/assets/favicon.png"
},
"description": "",
-
"packagerOpts": {
"config": "metro.config.js",
"sourceExts": [
diff --git a/src/app/assets/floodZonesAssets/PinIntransitavel.html b/src/app/assets/floodZonesAssets/PinIntransitavel.html
deleted file mode 100644
index db89246..0000000
--- a/src/app/assets/floodZonesAssets/PinIntransitavel.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/app/assets/floodZonesAssets/PinIntransitavel.js b/src/app/assets/floodZonesAssets/PinIntransitavel.js
new file mode 100644
index 0000000..f571b92
--- /dev/null
+++ b/src/app/assets/floodZonesAssets/PinIntransitavel.js
@@ -0,0 +1 @@
+export default PinIntransitavel = ``
\ No newline at end of file
diff --git a/src/app/assets/floodZonesAssets/PinTransitavel.html b/src/app/assets/floodZonesAssets/PinTransitavel.html
deleted file mode 100644
index 49d0163..0000000
--- a/src/app/assets/floodZonesAssets/PinTransitavel.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/app/assets/floodZonesAssets/PinTransitavel.js b/src/app/assets/floodZonesAssets/PinTransitavel.js
new file mode 100644
index 0000000..68ddedd
--- /dev/null
+++ b/src/app/assets/floodZonesAssets/PinTransitavel.js
@@ -0,0 +1 @@
+export default PinTransitavel = ``
\ No newline at end of file
diff --git a/src/app/assets/pluviometer/PinPluviometroArt.html b/src/app/assets/pluviometer/PinPluviometroArt.html
deleted file mode 100644
index 4ebbefd..0000000
--- a/src/app/assets/pluviometer/PinPluviometroArt.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/app/assets/pluviometer/PinPluviometroArt.js b/src/app/assets/pluviometer/PinPluviometroArt.js
new file mode 100644
index 0000000..cd29e07
--- /dev/null
+++ b/src/app/assets/pluviometer/PinPluviometroArt.js
@@ -0,0 +1 @@
+export default PinPluviometroArt = ``
\ No newline at end of file
diff --git a/src/app/assets/rain/PinChuvaForte.html b/src/app/assets/rain/PinChuvaForte.html
deleted file mode 100644
index 05da23e..0000000
--- a/src/app/assets/rain/PinChuvaForte.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/app/assets/rain/PinChuvaForte.js b/src/app/assets/rain/PinChuvaForte.js
new file mode 100644
index 0000000..10a7a38
--- /dev/null
+++ b/src/app/assets/rain/PinChuvaForte.js
@@ -0,0 +1 @@
+export default PinChuvaForte = ``
\ No newline at end of file
diff --git a/src/app/assets/rain/PinChuvaFraca.html b/src/app/assets/rain/PinChuvaFraca.html
deleted file mode 100644
index 3ac67e9..0000000
--- a/src/app/assets/rain/PinChuvaFraca.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/app/assets/rain/PinChuvaFraca.js b/src/app/assets/rain/PinChuvaFraca.js
new file mode 100644
index 0000000..47c2cbb
--- /dev/null
+++ b/src/app/assets/rain/PinChuvaFraca.js
@@ -0,0 +1 @@
+export default PinChuvaFraca = ``
\ No newline at end of file
diff --git a/src/app/assets/rain/PinChuvaModerada.html b/src/app/assets/rain/PinChuvaModerada.html
deleted file mode 100644
index 42356bb..0000000
--- a/src/app/assets/rain/PinChuvaModerada.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/app/assets/rain/PinChuvaModerada.js b/src/app/assets/rain/PinChuvaModerada.js
new file mode 100644
index 0000000..445a34c
--- /dev/null
+++ b/src/app/assets/rain/PinChuvaModerada.js
@@ -0,0 +1 @@
+export default PinChuvaModerada = ``
\ No newline at end of file
diff --git a/src/app/assets/rain/PinChuvaMuitoForte.html b/src/app/assets/rain/PinChuvaMuitoForte.html
deleted file mode 100644
index 4bebc16..0000000
--- a/src/app/assets/rain/PinChuvaMuitoForte.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/app/assets/rain/PinChuvaMuitoForte.js b/src/app/assets/rain/PinChuvaMuitoForte.js
new file mode 100644
index 0000000..58cdf40
--- /dev/null
+++ b/src/app/assets/rain/PinChuvaMuitoForte.js
@@ -0,0 +1 @@
+export default PinChuvaMuitoForte = ``
\ No newline at end of file
diff --git a/src/app/assets/rain/PinNublado.html b/src/app/assets/rain/PinNublado.html
deleted file mode 100644
index 390ac42..0000000
--- a/src/app/assets/rain/PinNublado.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/app/assets/rain/PinNublado.js b/src/app/assets/rain/PinNublado.js
new file mode 100644
index 0000000..5f3aa97
--- /dev/null
+++ b/src/app/assets/rain/PinNublado.js
@@ -0,0 +1 @@
+export default PinNublado = ``
\ No newline at end of file
diff --git a/src/app/assets/river/PinRioBaixo.html b/src/app/assets/river/PinRioBaixo.html
deleted file mode 100644
index 8ff851e..0000000
--- a/src/app/assets/river/PinRioBaixo.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/app/assets/river/PinRioBaixo.js b/src/app/assets/river/PinRioBaixo.js
new file mode 100644
index 0000000..49d46e4
--- /dev/null
+++ b/src/app/assets/river/PinRioBaixo.js
@@ -0,0 +1 @@
+export default PinRioBaixo = ``
\ No newline at end of file
diff --git a/src/app/assets/river/PinRioCheio.html b/src/app/assets/river/PinRioCheio.html
deleted file mode 100644
index f336e38..0000000
--- a/src/app/assets/river/PinRioCheio.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/app/assets/river/PinRioCheio.js b/src/app/assets/river/PinRioCheio.js
new file mode 100644
index 0000000..6c038f9
--- /dev/null
+++ b/src/app/assets/river/PinRioCheio.js
@@ -0,0 +1 @@
+export default PinRioCheio = ``
\ No newline at end of file
diff --git a/src/app/assets/river/PinRioExtravasado.html b/src/app/assets/river/PinRioExtravasado.html
deleted file mode 100644
index 2c5bb1d..0000000
--- a/src/app/assets/river/PinRioExtravasado.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/app/assets/river/PinRioExtravasado.js b/src/app/assets/river/PinRioExtravasado.js
new file mode 100644
index 0000000..9b9afcb
--- /dev/null
+++ b/src/app/assets/river/PinRioExtravasado.js
@@ -0,0 +1 @@
+export default PinRioExtravasado = ``
\ No newline at end of file
diff --git a/src/app/assets/river/PinRioNormal.html b/src/app/assets/river/PinRioNormal.html
deleted file mode 100644
index a1d0000..0000000
--- a/src/app/assets/river/PinRioNormal.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/app/assets/river/PinRioNormal.js b/src/app/assets/river/PinRioNormal.js
new file mode 100644
index 0000000..a46c9d7
--- /dev/null
+++ b/src/app/assets/river/PinRioNormal.js
@@ -0,0 +1 @@
+export default PinRioNormal = ``
\ No newline at end of file
diff --git a/src/app/components/map/LeafLetMap.js b/src/app/components/map/LeafLetMap.js
index 2560419..8c2f69d 100644
--- a/src/app/components/map/LeafLetMap.js
+++ b/src/app/components/map/LeafLetMap.js
@@ -62,10 +62,6 @@ function handleEvent(event) {
async function insertMarker(mapRef, ID, coordinate, icon) {
var iconSvg = icon;
- if (typeof icon !== 'string' && !(icon instanceof String)) {
- iconSvg = await loadLocalAsset(icon);
- }
-
mapRef.injectJavaScript(`
var customIcon = L.divIcon({
diff --git a/src/app/config/assets.js b/src/app/config/assets.js
index aaa5bea..3292cf1 100644
--- a/src/app/config/assets.js
+++ b/src/app/config/assets.js
@@ -31,6 +31,18 @@ import Weather_3_heavy_rain from "../assets/weather/weather_3_heavy_rain.svg";
import Weather_4_cloudy from "../assets/weather/weather_4_cloudy.svg";
import Weather_5_clean from "../assets/weather/weather_5_clean.svg";
+import PinNublado from "../assets/rain/PinNublado";
+import PinChuvaFraca from "../assets/rain/PinChuvaFraca";
+import PinChuvaModerada from "../assets/rain/PinChuvaModerada";
+import PinChuvaMuitoForte from "../assets/rain/PinChuvaMuitoForte";
+import PinChuvaForte from "../assets/rain/PinChuvaForte";
+
+import PinRioBaixo from "../assets/river/PinRioBaixo";
+import PinRioNormal from "../assets/river/PinRioNormal";
+import PinRioExtravasado from "../assets/river/PinRioExtravasado";
+import PinRioCheio from "../assets/river/PinRioCheio";
+import PinPluviometroArt from "../assets/pluviometer/PinPluviometroArt";
+
export default {
floodZones: {
FloodZonesIcon: FloodZones,
@@ -46,50 +58,50 @@ export default {
riverLevel: {
RiverIcon: RiverIcon,
- low_pin: require("../assets/river/PinRioBaixo.html"),
+ low_pin: PinRioBaixo,
low: require("../assets/river/rio_baixo.png"),
Low: RiverLow,
LowToggle: RiverLowToggle,
- normal_pin: require("../assets/river/PinRioNormal.html"),
+ normal_pin: PinRioNormal,
normal: require("../assets/river/rio_normal.png"),
Normal: RiverNormal,
NormalToggle: RiverNormalToggle,
- high_pin: require("../assets/river/PinRioCheio.html"),
+ high_pin: PinRioCheio,
high: require("../assets/river/rio_alto.png"),
High: RiverHigh,
HighToggle: RiverHighToggle,
- flooding_pin: require("../assets/river/PinRioExtravasado.html"),
+ flooding_pin: PinRioExtravasado,
flooding: require("../assets/river/rio_transbordando.png"),
Flooding: RiverFlood,
FloodingToggle: RiverFloodToggle,
},
rainLevel: {
RainIcon: RainIcon,
- rain_0_5_pin: require("../assets/rain/PinNublado.html"),
+ rain_0_5_pin: PinNublado,
rain_0_5: require("../assets/rain/sem_chuva.png"),
Rain_0_5: RainNot,
Rain_0_5_Toggle: RainNotToggle,
rain_1_5: require("../assets/rain/chuva_fraca.png"),
- rain_1_5_pin: require("../assets/rain/PinChuvaFraca.html"),
+ rain_1_5_pin: PinChuvaFraca,
Rain_1_5: RainLow,
Rain_1_5_Toggle: RainLowToggle,
rain_2_5: require("../assets/rain/chuva_logo.png"),
- rain_2_5_pin: require("../assets/rain/PinChuvaModerada.html"),
+ rain_2_5_pin: PinChuvaModerada,
Rain_2_5: RainMedium,
Rain_2_5_Toggle: RainMediumToggle,
rain_3_5: require("../assets/rain/chuva_forte.png"),
- rain_3_5_pin: require("../assets/rain/PinChuvaForte.html"),
+ rain_3_5_pin: PinChuvaForte,
Rain_3_5: RainHigh,
Rain_3_5_Toggle: RainHighToggle,
rain_4_5: require("../assets/rain/chuva_muito_forte.png"),
- rain_4_5_pin: require("../assets/rain/PinChuvaMuitoForte.html"),
+ rain_4_5_pin: PinChuvaMuitoForte,
Rain_4_5: RainVeryHigh,
Rain_4_5_Toggle: RainVeryHighToggle,
@@ -104,7 +116,7 @@ export default {
Weather_5_clean,
],
pluviometer: require("../assets/pluviometer/diario_pluviometrico.png"),
- pluviometer_pin: require("../assets/pluviometer/PinPluviometroArt.html"),
+ pluviometer_pin: PinPluviometroArt,
officialPluviometer: require("../assets/pluviometer/pluviometroOficial.png"),
officialPluviometer_pin: require("../assets/pluviometer/PinPluviometroOficial.png"),
PluviometerIcon: Pluviometer,
diff --git a/src/app/hooks/selectFromDB.js b/src/app/hooks/selectFromDB.js
index 15ae553..97c1b18 100644
--- a/src/app/hooks/selectFromDB.js
+++ b/src/app/hooks/selectFromDB.js
@@ -3,6 +3,9 @@ import { useState, useEffect, useReducer, useContext } from "react";
import { CurrentLocationContext } from "../context/CurrentLocationContext";
import "../config/globals";
import assets from "../config/assets";
+import PinIntransitavel from "../assets/floodZonesAssets/PinIntransitavel";
+import PinTransitavel from "../assets/floodZonesAssets/PinTransitavel";
+
const custom_assets = {
pluviometer: assets.pluviometer,
@@ -27,8 +30,8 @@ const custom_assets_pin = {
pluviometer: assets.pluviometer_pin,
officialPluviometer: assets.officialPluviometer_pin,
floodZones: {
- passable: require("../assets/floodZonesAssets/PinTransitavel.html"),
- not_passable: require("../assets/floodZonesAssets/PinIntransitavel.html"),
+ passable: PinTransitavel,
+ not_passable: PinIntransitavel,
},
riverLevel: ["low_pin", "normal_pin", "high_pin", "flooding_pin"].map(
(key) => {