Browse Source

Changing map markers icons

master
GabrielTrettel 3 years ago
parent
commit
2060af5dc1
  1. BIN
      src/app/assets/floodZonesAssets/not_passable_icon.png
  2. BIN
      src/app/assets/floodZonesAssets/passable_icon.png
  3. 1
      src/app/assets/pluviometer/PluviometroOficial.svg
  4. BIN
      src/app/assets/pluviometer/diario_pluviometrico.png
  5. BIN
      src/app/assets/pluviometer/pluviometroOficial.png
  6. BIN
      src/app/assets/rain/chuva_forte.png
  7. BIN
      src/app/assets/rain/chuva_fraca.png
  8. BIN
      src/app/assets/rain/chuva_logo.png
  9. BIN
      src/app/assets/rain/chuva_muito_forte.png
  10. BIN
      src/app/assets/rain/sem_chuva.png
  11. BIN
      src/app/assets/river/rio_alto.png
  12. BIN
      src/app/assets/river/rio_baixo.png
  13. BIN
      src/app/assets/river/rio_normal.png
  14. BIN
      src/app/assets/river/rio_transbordando.png
  15. 2
      src/app/components/MapModal.js
  16. 3
      src/app/config/assets.js
  17. 3
      src/app/hooks/selectFromDB.js

BIN
src/app/assets/floodZonesAssets/not_passable_icon.png

Before

Width: 357  |  Height: 202  |  Size: 2.9 KiB

After

Width: 2501  |  Height: 2500  |  Size: 136 KiB

BIN
src/app/assets/floodZonesAssets/passable_icon.png

Before

Width: 357  |  Height: 202  |  Size: 2.5 KiB

After

Width: 2500  |  Height: 2500  |  Size: 123 KiB

1
src/app/assets/pluviometer/PluviometroOficial.svg

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 600"><defs><style>.cls-1{fill:none;stroke-width:25.51px;}.cls-1,.cls-2{stroke:#fff;stroke-linecap:round;stroke-linejoin:round;}.cls-2,.cls-3{fill:#fff;}.cls-2{stroke-width:22.68px;}</style></defs><g id="Camada_2" data-name="Camada 2"><polygon class="cls-1" points="376.95 192.82 376.36 192.82 376.36 123.03 193.54 123.03 193.54 193.57 194.56 193.57 221.62 240.65 221.62 240.65 246.71 574 321.99 574 346.94 240.65 347.08 240.65 376.95 192.82"/><polygon class="cls-2" points="364.37 311.91 354.13 311.91 234 311.91 239.83 365.41 354.13 365.41 354.13 365.86 389.15 365.86 389.15 396.26 424.61 396.26 424.61 365.86 424.61 365.69 424.61 311.91 364.37 311.91"/><path class="cls-3" d="M313.82,73.54a28.9,28.9,0,1,1-57.79,0c0-16,28.9-58.54,28.9-58.54S313.82,57.59,313.82,73.54Z"/></g></svg>

BIN
src/app/assets/pluviometer/diario_pluviometrico.png

Before

Width: 248  |  Height: 251  |  Size: 2.3 KiB

After

Width: 2501  |  Height: 2500  |  Size: 87 KiB

BIN
src/app/assets/pluviometer/pluviometroOficial.png

After

Width: 2501  |  Height: 2500  |  Size: 81 KiB

BIN
src/app/assets/rain/chuva_forte.png

Before

Width: 438  |  Height: 444  |  Size: 38 KiB

After

Width: 2501  |  Height: 2500  |  Size: 125 KiB

BIN
src/app/assets/rain/chuva_fraca.png

Before

Width: 314  |  Height: 314  |  Size: 18 KiB

After

Width: 2501  |  Height: 2500  |  Size: 117 KiB

BIN
src/app/assets/rain/chuva_logo.png

Before

Width: 248  |  Height: 251  |  Size: 2.5 KiB

After

Width: 2500  |  Height: 2500  |  Size: 123 KiB

BIN
src/app/assets/rain/chuva_muito_forte.png

Before

Width: 554  |  Height: 548  |  Size: 51 KiB

After

Width: 2501  |  Height: 2500  |  Size: 117 KiB

BIN
src/app/assets/rain/sem_chuva.png

Before

Width: 242  |  Height: 242  |  Size: 14 KiB

After

Width: 2501  |  Height: 2500  |  Size: 120 KiB

BIN
src/app/assets/river/rio_alto.png

Before

Width: 104  |  Height: 106  |  Size: 2.1 KiB

After

Width: 2500  |  Height: 2500  |  Size: 69 KiB

BIN
src/app/assets/river/rio_baixo.png

Before

Width: 104  |  Height: 105  |  Size: 1.1 KiB

After

Width: 2501  |  Height: 2500  |  Size: 70 KiB

BIN
src/app/assets/river/rio_normal.png

Before

Width: 104  |  Height: 105  |  Size: 1.2 KiB

After

Width: 2501  |  Height: 2500  |  Size: 70 KiB

BIN
src/app/assets/river/rio_transbordando.png

Before

Width: 105  |  Height: 104  |  Size: 1.2 KiB

After

Width: 2501  |  Height: 2500  |  Size: 70 KiB

2
src/app/components/MapModal.js

@ -220,7 +220,7 @@ function MapModal(props) {
{topBar(props)} {topBar(props)}
{componentBody(props)} {componentBody(props)}
{isPluviometer(props.name) ? moreInfo(props) : null} {isPluviometer(props.name) ? moreInfo(props) : null}
{isPluviometer(props.name) ? reviews(props) : null}
{!isPluviometer(props.name) ? reviews(props) : null}
</SelfClosingModal> </SelfClosingModal>
); );
} }

3
src/app/config/assets.js

@ -71,7 +71,7 @@ export default {
Rain_1_5: RainLow, Rain_1_5: RainLow,
Rain_1_5_Toggle: RainLowToggle, 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: RainMedium,
Rain_2_5_Toggle: RainMediumToggle, Rain_2_5_Toggle: RainMediumToggle,
@ -94,6 +94,7 @@ export default {
Weather_5_clean, Weather_5_clean,
], ],
pluviometer: require("../assets/pluviometer/diario_pluviometrico.png"), pluviometer: require("../assets/pluviometer/diario_pluviometrico.png"),
officialPluviometer: require("../assets/pluviometer/pluviometroOficial.png"),
PluviometerIcon: Pluviometer, PluviometerIcon: Pluviometer,
AppLogoTitle: AppLogoTitle, AppLogoTitle: AppLogoTitle,
}; };

3
src/app/hooks/selectFromDB.js

@ -6,6 +6,7 @@ import assets from "../config/assets";
const custom_assets = { const custom_assets = {
pluviometer: assets.pluviometer, pluviometer: assets.pluviometer,
officialPluviometer: assets.officialPluviometer,
floodZones: assets.floodZones, floodZones: assets.floodZones,
riverLevel: ["low", "normal", "high", "flooding"].map((key) => { riverLevel: ["low", "normal", "high", "flooding"].map((key) => {
return assets.riverLevel[key]; return assets.riverLevel[key];
@ -208,7 +209,7 @@ function buildRandonData(location, addr) {
return points.map((points) => { return points.map((points) => {
return { return {
image: custom_assets.pluviometer,
image: custom_assets.officialPluviometer,
ID: ++ID, ID: ++ID,
name: "officialPluviometer", name: "officialPluviometer",
title: "Pluviometro Oficial " + i++, title: "Pluviometro Oficial " + i++,

Loading…
Cancel
Save