Fix icons not working on web

wangwillian0 · May 29, 2023 · fe33aec · fe33aec
1 parent 9d23c6a
commit fe33aec
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 2 deletions.
diff --git a/assets/accessory_icons/bug_report.png b/assets/accessory_icons/bug_report.png
diff --git a/assets/accessory_icons/business_center.png b/assets/accessory_icons/business_center.png
diff --git a/assets/accessory_icons/credit_card.png b/assets/accessory_icons/credit_card.png
diff --git a/assets/accessory_icons/directions_car.png b/assets/accessory_icons/directions_car.png
diff --git a/assets/accessory_icons/directions_walk.png b/assets/accessory_icons/directions_walk.png
diff --git a/assets/accessory_icons/favorite.png b/assets/accessory_icons/favorite.png
diff --git a/assets/accessory_icons/language.png b/assets/accessory_icons/language.png
diff --git a/assets/accessory_icons/pedal_bike.png b/assets/accessory_icons/pedal_bike.png
diff --git a/assets/accessory_icons/pets.png b/assets/accessory_icons/pets.png
diff --git a/assets/accessory_icons/place.png b/assets/accessory_icons/place.png
diff --git a/assets/accessory_icons/push_pin.png b/assets/accessory_icons/push_pin.png
diff --git a/assets/accessory_icons/redeem.png b/assets/accessory_icons/redeem.png
diff --git a/assets/accessory_icons/school.png b/assets/accessory_icons/school.png
diff --git a/assets/accessory_icons/visibility.png b/assets/accessory_icons/visibility.png
diff --git a/assets/accessory_icons/vpn_key.png b/assets/accessory_icons/vpn_key.png
diff --git a/assets/accessory_icons/work.png b/assets/accessory_icons/work.png
diff --git a/lib/map/map.dart b/lib/map/map.dart
@@ -27,6 +27,7 @@ class _AccessoryMapState extends State<AccessoryMap> {
   void Function()? cancelLocationUpdates;
   void Function()? cancelAccessoryUpdates;
   bool accessoryInitialized = false;
+  bool mapStyleLoaded = false;
 
   @override
   void initState() {
@@ -85,11 +86,13 @@ class _AccessoryMapState extends State<AccessoryMap> {
   }
 
   updateMarkers(MapboxMapController controller, UnmodifiableListView<Accessory> accessories) async {
+    mapStyleLoaded = true;
     controller.removeCircles(controller.circles);
     controller.removeSymbols(controller.symbols);
 
     Set<String> iconStrings = accessories.map((accessory) => accessory.iconString).toSet();
     for (String iconString in iconStrings) {
+      // to convert from svg to RGBA png use `convert -background "rgba(0,0,0,0)" $f png32:${f%.*}.png`
       await addImageFromAsset(controller, iconString, "assets/accessory_icons/$iconString.png");
     }
 
@@ -111,7 +114,7 @@ class _AccessoryMapState extends State<AccessoryMap> {
         .map((accessory) => SymbolOptions(
           geometry: accessory.lastLocation!,
           iconImage: accessory.iconString,
-          iconSize: 1.0,
+          iconSize: 0.425 * MediaQuery.of(context).devicePixelRatio,
           textField: accessory.name,
           textColor: "#000000",
           textOffset: const Offset(0, 1.5),
@@ -132,7 +135,7 @@ class _AccessoryMapState extends State<AccessoryMap> {
           accessoryInitialized = true;
         }     
 
-        if (_mapController != null) {
+        if (mapStyleLoaded) {
           updateMarkers(_mapController!, accessories);
         }