fix : change map to openStreet

2025-04-26 09:45:28 +03:30
parent 12be91d7f8
commit 6e6d2b22f6
7 changed files with 106 additions and 198 deletions
--- a/features/inspection/lib/presentation/filter/view.dart
+++ b/features/inspection/lib/presentation/filter/view.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
+import 'package:inspection/presentation/routes/app_routes.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:rasadyar_core/core.dart';
 import 'package:rasadyar_core/presentation/widget/buttons/fab.dart';
-import 'package:inspection/presentation/routes/app_routes.dart';

 import 'logic.dart';

@@ -46,15 +46,13 @@ class SupervisionFilterPage extends GetView<SupervisionFilterLogic> {
              ),
              children: [
                TileLayer(
-                  urlTemplate:
-                  "https://map.ir/shiveh/xyz/1.0.0/Shiveh:Shiveh@EPSG:3857@png/{z}/{x}/{y}.png"
-                      "?x-api-key=$token",
+                  urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                ),

                ObxValue((markers) {
                  return MarkerLayer(
                    markers:
-                    markers.map((marker) => markerWidget(marker)).toList(),
+                        markers.map((marker) => markerWidget(marker)).toList(),
                  );
                }, controller.markers),
              ],
@@ -71,9 +69,9 @@ class SupervisionFilterPage extends GetView<SupervisionFilterLogic> {
                onPressed: () {
                  controller.isLoading.value = true;
                  controller.determineCurrentPosition().then(
-                        (value) =>
-                    controller.isLoading.value =
-                    !controller.isLoading.value,
+                    (value) =>
+                        controller.isLoading.value =
+                            !controller.isLoading.value,
                  );
                },
              );
@@ -86,21 +84,22 @@ class SupervisionFilterPage extends GetView<SupervisionFilterLogic> {
              backgroundColor: AppColor.blueNormal,
              icon: vecWidget(Assets.vecFilterSvg, width: 24, height: 24),
              onPressed: () {
-                controller.sheetController.value.addBottomSheet(child: filterWidget(),
-                    initHeight: 400,
-                    maxHeight: 470,
-                    minHeight: 350);
+                controller.sheetController.value.addBottomSheet(
+                  child: filterWidget(),
+                  initHeight: 400,
+                  maxHeight: 470,
+                  minHeight: 350,
+                );
              },
            ),
          ),
          Obx(
-                () =>
-                Stack(
-                  children:
+            () => Stack(
+              children:
                  controller.sheetController.value.bottomSheets
                      .map((sheet) => sheet)
                      .toList(),
-                ),
+            ),
          ),
        ],
      ),
@@ -566,28 +565,27 @@ class SupervisionFilterPage extends GetView<SupervisionFilterLogic> {

          ...List.generate(
            5,
-                (index) =>
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  crossAxisAlignment: CrossAxisAlignment.center,
+            (index) => Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              crossAxisAlignment: CrossAxisAlignment.center,

-                  children: [
-                    Text(
-                      'فروش رفته',
-                      textAlign: TextAlign.center,
-                      style: AppFonts.yekan14.copyWith(
-                        color: AppColor.darkGreyDarkHover,
-                      ),
-                    ),
-                    Text(
-                      '0 کیلوگرم',
-                      textAlign: TextAlign.center,
-                      style: AppFonts.yekan14.copyWith(
-                        color: AppColor.darkGreyDarkHover,
-                      ),
-                    ),
-                  ],
+              children: [
+                Text(
+                  'فروش رفته',
+                  textAlign: TextAlign.center,
+                  style: AppFonts.yekan14.copyWith(
+                    color: AppColor.darkGreyDarkHover,
+                  ),
                ),
+                Text(
+                  '0 کیلوگرم',
+                  textAlign: TextAlign.center,
+                  style: AppFonts.yekan14.copyWith(
+                    color: AppColor.darkGreyDarkHover,
+                  ),
+                ),
+              ],
+            ),
          ),
        ],
      ),
@@ -611,21 +609,19 @@ class SupervisionFilterPage extends GetView<SupervisionFilterLogic> {
          color: isSelected ? AppColor.blueNormal : AppColor.whiteGreyNormal,
          borderRadius: BorderRadius.circular(8),
          border:
-          isSelected
-              ? Border.fromBorderSide(BorderSide.none)
-              : Border.all(width: 0.25, color: const Color(0xFFB0B0B0)),
+              isSelected
+                  ? Border.fromBorderSide(BorderSide.none)
+                  : Border.all(width: 0.25, color: const Color(0xFFB0B0B0)),
        ),
        child: Text(
          title,
          textAlign: TextAlign.center,
          style:
-          isSelected
-              ? AppFonts.yekan10.copyWith(color: AppColor.whiteLight)
-              : AppFonts.yekan10,
+              isSelected
+                  ? AppFonts.yekan10.copyWith(color: AppColor.whiteLight)
+                  : AppFonts.yekan10,
        ),
      ),
    );
  }
-
-
 }
--- a/features/inspection/pubspec.lock
+++ b/features/inspection/pubspec.lock
@@ -130,10 +130,10 @@ packages:
    dependency: transitive
    description:
      name: flutter_svg
-      sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b
+      sha256: d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.17"
+    version: "2.1.0"
  flutter_web_plugins:
    dependency: transitive
    description: flutter
@@ -367,10 +367,10 @@ packages:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12"
+      sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.16"
+    version: "2.2.17"
  path_provider_foundation:
    dependency: transitive
    description:
@@ -407,26 +407,26 @@ packages:
    dependency: transitive
    description:
      name: permission_handler
-      sha256: "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849"
+      sha256: "2d070d8684b68efb580a5997eb62f675e8a885ef0be6e754fb9ef489c177470f"
      url: "https://pub.dev"
    source: hosted
-    version: "11.4.0"
+    version: "12.0.0+1"
  permission_handler_android:
    dependency: transitive
    description:
      name: permission_handler_android
-      sha256: d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc
+      sha256: "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6"
      url: "https://pub.dev"
    source: hosted
-    version: "12.1.0"
+    version: "13.0.1"
  permission_handler_apple:
    dependency: transitive
    description:
      name: permission_handler_apple
-      sha256: f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98
+      sha256: f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023
      url: "https://pub.dev"
    source: hosted
-    version: "9.4.6"
+    version: "9.4.7"
  permission_handler_html:
    dependency: transitive
    description:
@@ -451,6 +451,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.2.1"
+  persian_datetime_picker:
+    dependency: transitive
+    description:
+      name: persian_datetime_picker
+      sha256: "7ccbfd3a68dc89d405550f624e9fa590c914fed2aa2d48973c4f4400baab2e06"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
  petitparser:
    dependency: transitive
    description:
@@ -506,6 +514,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.28.0"
+  shamsi_date:
+    dependency: transitive
+    description:
+      name: shamsi_date
+      sha256: "4614789ed11bfffe5ba0aa157a20f2857ab6328528401766e0d924e453c866bd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
  sky_engine:
    dependency: transitive
    description: flutter