improvements

lib/modules/asset_tracking/asset_tracking_provider.dart

@@ -67,7 +67,7 @@ class AssetTrackingProvider extends ChangeNotifier {
     notifyListeners();
   }
 
-  Future<int> getAssetsFromPenguin({bool loadMore = false,AssetTrackingSearchModel? searchModel}) async {
+  Future<int> getAssetsFromPenguin({bool loadMore = false, AssetTrackingSearchModel? searchModel}) async {
     if (isLoading || isNextPageLoading) return -2;
     if (loadMore) {
       isNextPageLoading = true;
@@ -136,6 +136,7 @@ class AssetTrackingProvider extends ChangeNotifier {
   Future getZoneFromPenguin() async {
     if (zonesList.isNotEmpty) {
       await Future.delayed(const Duration(milliseconds: 250));
+      calculateCoordinates();
       return;
     }
     try {
@@ -144,7 +145,8 @@ class AssetTrackingProvider extends ChangeNotifier {
         final Map<String, dynamic> jsonData = json.decode(response.body);
         List list = jsonData["data"];
         zonesList.addAll(list.map((item) => ZoneModel.fromJson(item)).toList());
-        notify();
+        calculateCoordinates();
+        // notify();
       }
     } catch (error) {
       print("getZoneFromPenguin:Error:$error");

lib/modules/asset_tracking/map_tracking_page.dart

@@ -216,7 +216,29 @@ class _MapTrackingPageState extends State<MapTrackingPage> {
 
           // if (!inAppView || )
           if (markers.isNotEmpty) MarkerLayer(markers: markers),
+        ],
         if (inAppView)
+          Selector<AssetTrackingProvider, List<Coordinates>>(
+              selector: (_, assetTPro) => assetTPro.coordinates,
+              builder: (_, coordinates, __) {
+                if (coordinates.isEmpty) return const SizedBox();
+
+                List<LatLng> list = [
+                  for (var coordinate in (coordinates)) LatLng(coordinate.latitude!, coordinate.longitude!),
+                ];
+                List<Polygon> zonesPolygons = [
+                  Polygon(
+                    label: assetTrackingProvider.selectedBuilding?.label ?? "",
+                    labelStyle: AppTextStyles.bodyText2.copyWith(color: AppColor.textColor(context)),
+                    points: list,
+                    color: AppColor.red30.withOpacity(0.3),
+                    borderColor: AppColor.red30,
+                    borderStrokeWidth: 2.0,
+                  ),
+                ];
+                return PolygonLayer(polygons: zonesPolygons, hitNotifier: _polygonHitNotifier);
+              }),
+        if (_geojson != null && inAppView)
           Positioned(
             bottom: 0,
             left: 0,
@@ -280,28 +302,6 @@ class _MapTrackingPageState extends State<MapTrackingPage> {
                   //       ).bottomSheetContainer(context, padding: const EdgeInsets.all(16));
                 }),
           ),
-        ],
-        if (inAppView)
-          Selector<AssetTrackingProvider, List<Coordinates>>(
-              selector: (_, assetTPro) => assetTPro.coordinates,
-              builder: (_, coordinates, __) {
-                if (coordinates.isEmpty) return const SizedBox();
-
-                List<LatLng> list = [
-                  for (var coordinate in (coordinates)) LatLng(coordinate.latitude!, coordinate.longitude!),
-                ];
-                List<Polygon> zonesPolygons = [
-                  Polygon(
-                    label: assetTrackingProvider.selectedBuilding?.label ?? "",
-                    labelStyle: AppTextStyles.bodyText2.copyWith(color: AppColor.textColor(context)),
-                    points: list,
-                    color: AppColor.red30.withOpacity(0.3),
-                    borderColor: AppColor.red30,
-                    borderStrokeWidth: 2.0,
-                  ),
-                ];
-                return PolygonLayer(polygons: zonesPolygons);
-              }),
         Positioned(
           top: 70,
           right: 8,
@@ -430,7 +430,9 @@ class _MapTrackingPageState extends State<MapTrackingPage> {
                               assetTrackingProvider.notify();
 
                               assetTrackingProvider.getAssetsFromPenguinByFloor();
-                              if (assetProvider.selectedFloor != null) {
+                              if (assetProvider.selectedFloor == null) {
+                                assetTrackingProvider.getZoneFromPenguin();
+                              } else if (assetProvider.selectedFloor != null) {
                                 getFloorMap(assetProvider.selectedFloor!.id!);
                                 assetTrackingProvider.getZoneFromPenguin();
                               } else {