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
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -17,7 +17,7 @@ void main() async {



-class ForDevicePreview extends StatelessWidget {
+/*class ForDevicePreview extends StatelessWidget {
  const ForDevicePreview({super.key});

  @override
@@ -35,7 +35,7 @@ class ForDevicePreview extends StatelessWidget {
      getPages: AppPages.pages,
    );
  }
-}
+}*/

 class MyApp extends StatelessWidget {
  const MyApp({super.key});
--- a/packages/core/pubspec.lock
+++ b/packages/core/pubspec.lock
@@ -5,18 +5,18 @@ packages:
    dependency: transitive
    description:
      name: _fe_analyzer_shared
-      sha256: dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57
+      sha256: e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f
      url: "https://pub.dev"
    source: hosted
-    version: "80.0.0"
+    version: "82.0.0"
  analyzer:
    dependency: transitive
    description:
      name: analyzer
-      sha256: "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e"
+      sha256: "13c1e6c6fd460522ea840abec3f677cc226f5fec7872c04ad7b425517ccf54f7"
      url: "https://pub.dev"
    source: hosted
-    version: "7.3.0"
+    version: "7.4.4"
  args:
    dependency: transitive
    description:
@@ -250,10 +250,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_svg
-      sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b
+      sha256: d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.17"
+    version: "2.1.0"
  flutter_test:
    dependency: "direct dev"
    description: flutter
@@ -412,10 +412,10 @@ packages:
    dependency: "direct dev"
    description:
      name: json_serializable
-      sha256: "81f04dee10969f89f604e1249382d46b97a1ccad53872875369622b5bfc9e58a"
+      sha256: c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c
      url: "https://pub.dev"
    source: hosted
-    version: "6.9.4"
+    version: "6.9.5"
  leak_tracker:
    dependency: transitive
    description:
@@ -500,10 +500,10 @@ packages:
    dependency: transitive
    description:
      name: mockito
-      sha256: f99d8d072e249f719a5531735d146d8cf04c580d93920b04de75bef6dfb2daf6
+      sha256: "4546eac99e8967ea91bae633d2ca7698181d008e95fa4627330cf903d573277a"
      url: "https://pub.dev"
    source: hosted
-    version: "5.4.5"
+    version: "5.4.6"
  mocktail:
    dependency: "direct dev"
    description:
@@ -548,10 +548,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:
@@ -588,26 +588,26 @@ packages:
    dependency: "direct main"
    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:
@@ -881,18 +881,18 @@ packages:
    dependency: transitive
    description:
      name: web_socket
-      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      sha256: bfe6f435f6ec49cb6c01da1e275ae4228719e59a6b067048c51e72d9d63bcc4b
      url: "https://pub.dev"
    source: hosted
-    version: "0.1.6"
+    version: "1.0.0"
  web_socket_channel:
    dependency: transitive
    description:
      name: web_socket_channel
-      sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5"
+      sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
  xdg_directories:
    dependency: transitive
    description:
--- a/packages/core/pubspec.yaml
+++ b/packages/core/pubspec.yaml
@@ -41,7 +41,7 @@ dependencies:
  ##Di
  get_it: ^8.0.3

-  permission_handler: ^11.4.0
+  permission_handler: ^12.0.0+1
  persian_datetime_picker: ^3.1.0


--- a/pubspec.lock
+++ b/pubspec.lock
@@ -81,22 +81,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.2.0"
-  device_frame:
-    dependency: transitive
-    description:
-      name: device_frame
-      sha256: d031a06f5d6f4750009672db98a5aa1536aa4a231713852469ce394779a23d75
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
-  device_preview:
-    dependency: "direct main"
-    description:
-      name: device_preview
-      sha256: a694acdd3894b4c7d600f4ee413afc4ff917f76026b97ab06575fe886429ef19
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
  fake_async:
    dependency: transitive
    description:
@@ -113,14 +97,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.4"
-  file:
-    dependency: transitive
-    description:
-      name: file
-      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.1"
  fixnum:
    dependency: transitive
    description:
@@ -142,11 +118,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "5.0.0"
-  flutter_localizations:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
  flutter_map:
    dependency: transitive
    description:
@@ -183,10 +154,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_test:
    dependency: "direct dev"
    description: flutter
@@ -206,13 +177,13 @@ packages:
    source: hosted
    version: "10.8.0"
  freezed_annotation:
-    dependency: "direct overridden"
+    dependency: transitive
    description:
      name: freezed_annotation
-      sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2
+      sha256: c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.4"
+    version: "3.0.0"
  geolocator:
    dependency: transitive
    description:
@@ -320,10 +291,10 @@ packages:
    dependency: transitive
    description:
      name: intl
-      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
      url: "https://pub.dev"
    source: hosted
-    version: "0.19.0"
+    version: "0.20.2"
  json_annotation:
    dependency: transitive
    description:
@@ -444,14 +415,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.0.0"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
  path:
    dependency: transitive
    description:
@@ -480,10 +443,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:
@@ -520,26 +483,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:
@@ -612,14 +575,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.0"
-  provider:
-    dependency: transitive
-    description:
-      name: provider
-      sha256: "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.4"
  rasadyar_core:
    dependency: "direct main"
    description:
@@ -643,62 +598,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.4"
-  shared_preferences:
-    dependency: transitive
-    description:
-      name: shared_preferences
-      sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.3"
-  shared_preferences_android:
-    dependency: transitive
-    description:
-      name: shared_preferences_android
-      sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.10"
-  shared_preferences_foundation:
-    dependency: transitive
-    description:
-      name: shared_preferences_foundation
-      sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.4"
-  shared_preferences_linux:
-    dependency: transitive
-    description:
-      name: shared_preferences_linux
-      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  shared_preferences_platform_interface:
-    dependency: transitive
-    description:
-      name: shared_preferences_platform_interface
-      sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  shared_preferences_web:
-    dependency: transitive
-    description:
-      name: shared_preferences_web
-      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.3"
-  shared_preferences_windows:
-    dependency: transitive
-    description:
-      name: shared_preferences_windows
-      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
  sky_engine:
    dependency: transitive
    description: flutter
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -18,10 +18,7 @@ dependencies:
  rasadyar_core:
    path: ./packages/core

-  device_preview: ^1.2.0

-dependency_overrides:
-  freezed_annotation: ^2.4.1

 dev_dependencies:
  flutter_test: