mr.mojtaba/rasadyar_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat : Cluster Map

Browse Source
This commit is contained in:
mr.mojtaba
2025-07-29 10:50:18 +03:30
parent 8acd951c05
commit 716dd6e70a
7 changed files with 225 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/core/lib/core.dart
View File

@@ -36,6 +36,7 @@ export 'package:pretty_dio_logger/pretty_dio_logger.dart';
export 'package:rasadyar_core/presentation/common/common.dart'; export 'package:rasadyar_core/presentation/common/common.dart';
export 'package:rasadyar_core/presentation/utils/utils.dart'; export 'package:rasadyar_core/presentation/utils/utils.dart';
export 'package:rasadyar_core/presentation/widget/widget.dart'; export 'package:rasadyar_core/presentation/widget/widget.dart';
export 'package:flutter_map_marker_cluster/flutter_map_marker_cluster.dart';
//models //models
export 'data/model/model.dart'; export 'data/model/model.dart';

64
packages/core/pubspec.lock
View File

@@ -25,6 +25,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "5.3.0" version: "5.3.0"
animated_stack_widget:
dependency: transitive
description:
name: animated_stack_widget
sha256: ce4788dd158768c9d4388354b6fb72600b78e041a37afc4c279c63ecafcb9408
url: "https://pub.dev"
source: hosted
version: "0.0.4"
archive: archive:
dependency: transitive dependency: transitive
description: description:
@@ -217,14 +225,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.2.0" version: "1.2.0"
dart_polylabel2:
dependency: transitive
description:
name: dart_polylabel2
sha256: "7eeab15ce72894e4bdba6a8765712231fc81be0bd95247de4ad9966abc57adc6"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
dart_style: dart_style:
dependency: transitive dependency: transitive
description: description:
@@ -391,18 +391,34 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: flutter_map name: flutter_map
sha256: df33e784b09fae857c6261a5521dd42bd4d3342cb6200884bb70730638af5fd5 sha256: "2ecb34619a4be19df6f40c2f8dce1591675b4eff7a6857bd8f533706977385da"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "8.2.1" version: "7.0.2"
flutter_map_animations: flutter_map_animations:
dependency: "direct main" dependency: "direct main"
description: description:
name: flutter_map_animations name: flutter_map_animations
sha256: bf583863561861aaaf4854ae7ed8940d79bea7d32918bf7a85d309b25235a09e sha256: "08233f89919049a3601e785d32e9d1d9e1faac6578190150f1d7495fc1050d36"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.9.0" version: "0.8.0"
flutter_map_marker_cluster:
dependency: "direct main"
description:
name: flutter_map_marker_cluster
sha256: "2c1fb4d7a2105c4bbeb89be215320507f4b71b2036df4341fab9d2aa677d3ae9"
url: "https://pub.dev"
source: hosted
version: "1.4.0"
flutter_map_marker_popup:
dependency: transitive
description:
name: flutter_map_marker_popup
sha256: a7540538114b5d1627ab67b498273d66bc36090385412ae49ef215af4a2861c5
url: "https://pub.dev"
source: hosted
version: "7.0.0"
flutter_plugin_android_lifecycle: flutter_plugin_android_lifecycle:
dependency: transitive dependency: transitive
description: description:
@@ -957,6 +973,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.0.4" version: "1.0.4"
nested:
dependency: transitive
description:
name: nested
sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
package_config: package_config:
dependency: transitive dependency: transitive
description: description:
@@ -1133,6 +1157,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.9.1" version: "3.9.1"
polylabel:
dependency: transitive
description:
name: polylabel
sha256: "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b"
url: "https://pub.dev"
source: hosted
version: "1.0.1"
pool: pool:
dependency: transitive dependency: transitive
description: description:
@@ -1165,6 +1197,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.0" version: "2.1.0"
provider:
dependency: transitive
description:
name: provider
sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
url: "https://pub.dev"
source: hosted
version: "6.1.5"
pub_semver: pub_semver:
dependency: transitive dependency: transitive
description: description:

5
packages/core/pubspec.yaml
View File

@@ -68,8 +68,9 @@ dependencies:
android_intent_plus: ^5.3.0 android_intent_plus: ^5.3.0
#Map #Map
flutter_map: ^8.2.1 flutter_map: ^7.0.0
flutter_map_animations: ^0.9.0 flutter_map_animations: ^0.8.0
flutter_map_marker_cluster: ^1.4.0
#location #location
latlong2: ^0.9.1 latlong2: ^0.9.1
geolocator: ^14.0.2 geolocator: ^14.0.2

46
packages/inspection/lib/presentation/pages/inspection_map/logic.dart
View File

@@ -1,4 +1,5 @@
import 'dart:async'; import 'dart:async';
import 'dart:math';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart';
@@ -11,12 +12,12 @@ import '../filter/view.dart';
class InspectionMapLogic extends GetxController with GetTickerProviderStateMixin { class InspectionMapLogic extends GetxController with GetTickerProviderStateMixin {
final BaseLogic baseLogic = Get.find<BaseLogic>(); final BaseLogic baseLogic = Get.find<BaseLogic>();
final distance = Distance();
Rx<LatLng> currentLocation = LatLng(34.798315281272544, 48.51479142983491).obs; Rx<LatLng> currentLocation = LatLng(34.798315281272544, 48.51479142983491).obs;
Rx<Resource<List<PoultryLocationModel>>> allPoultryLocation = Rx<Resource<List<PoultryLocationModel>>> allPoultryLocation =
Resource<List<PoultryLocationModel>>.loading().obs; Resource<List<PoultryLocationModel>>.loading().obs;
RxList<PoultryLocationModel> markers = <PoultryLocationModel>[].obs; RxList<Marker> markers = <Marker>[].obs;
Timer? _debounceTimer; Timer? _debounceTimer;
RxBool isLoading = false.obs; RxBool isLoading = false.obs;
@@ -25,6 +26,7 @@ class InspectionMapLogic extends GetxController with GetTickerProviderStateMixin
RxInt filterIndex = 0.obs; RxInt filterIndex = 0.obs;
RxInt showIndex = 0.obs; RxInt showIndex = 0.obs;
bool showSlideHint = true; bool showSlideHint = true;
RxInt currentZoom = 15.obs;
late Rx<SlidableController> slidController; late Rx<SlidableController> slidController;
@@ -114,17 +116,28 @@ class InspectionMapLogic extends GetxController with GetTickerProviderStateMixin
isLoading.value = false; isLoading.value = false;
} }
void debouncedUpdateVisibleMarkers({required LatLng center}) { void debouncedUpdateVisibleMarkers({required LatLng center, required double zoom}) {
_debounceTimer?.cancel(); _debounceTimer?.cancel();
_debounceTimer = Timer(const Duration(milliseconds: 300), () { _debounceTimer = Timer(const Duration(milliseconds: 300), () {
var raduis = getVisibleRadiusKm(
zoom: zoom,
screenWidthPx: Get.width.toDouble(),
latitude: center.latitude,
);
final filtered = filterNearbyMarkers( final filtered = filterNearbyMarkers(
allPoultryLocation.value.data ?? [], allPoultryLocation.value.data ?? [],
center.latitude, center.latitude,
center.longitude, center.longitude,
10000, // Radius in meters raduis * 1000, // Radius in meters
);
markers.assignAll(
filtered.map(
(e) => Marker(
point: LatLng(e.lat ?? 0, e.long ?? 0),
child: Icon(Icons.location_on, color: Colors.red),
),
),
); );
markers.addAll(filtered);
}); });
} }
@@ -135,11 +148,10 @@ class InspectionMapLogic extends GetxController with GetTickerProviderStateMixin
double radiusInMeters, double radiusInMeters,
) { ) {
final center = LatLng(centerLat, centerLng); final center = LatLng(centerLat, centerLng);
final distance = Distance();
return allMarkers.where((marker) { return allMarkers.where((marker) {
var tmp =LatLng(marker.lat ?? 0, marker.long ?? 0); var tmp = LatLng(marker.lat ?? 0, marker.long ?? 0);
return distance(center,tmp ) <= radiusInMeters; return distance(center, tmp) <= radiusInMeters;
}).toList(); }).toList();
} }
@@ -155,7 +167,11 @@ class InspectionMapLogic extends GetxController with GetTickerProviderStateMixin
isLoading.value = true; isLoading.value = true;
allPoultryLocation.value = Resource<List<PoultryLocationModel>>.loading(); allPoultryLocation.value = Resource<List<PoultryLocationModel>>.loading();
await safeCall( await safeCall(
call: () => inspectionRepository.getNearbyLocation(), call: () => inspectionRepository.getNearbyLocation(
centerLat: currentLocation.value.latitude,
centerLng: currentLocation.value.longitude,
radius: 15, // Radius in K meters
),
onSuccess: (result) { onSuccess: (result) {
if (result != null) { if (result != null) {
allPoultryLocation.value = Resource<List<PoultryLocationModel>>.success(result); allPoultryLocation.value = Resource<List<PoultryLocationModel>>.success(result);
@@ -170,4 +186,14 @@ class InspectionMapLogic extends GetxController with GetTickerProviderStateMixin
}, },
); );
} }
double getVisibleRadiusKm({
required double zoom,
required double screenWidthPx,
required double latitude,
}) {
double metersPerPixel = 156543.03392 * cos(latitude * pi / 180) / pow(2, zoom);
double visibleWidthInMeters = metersPerPixel * screenWidthPx;
return (visibleWidthInMeters / 2) / 1000; // radius in KM
}
} }

56
packages/inspection/lib/presentation/pages/inspection_map/view.dart
View File

@@ -1,6 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart';
import 'package:rasadyar_inspection/presentation/pages/filter/view.dart';
import 'package:rasadyar_inspection/presentation/routes/app_routes.dart'; import 'package:rasadyar_inspection/presentation/routes/app_routes.dart';
import 'package:rasadyar_inspection/presentation/widget/base_page/view.dart'; import 'package:rasadyar_inspection/presentation/widget/base_page/view.dart';
import 'package:rasadyar_inspection/presentation/widget/custom_chips.dart'; import 'package:rasadyar_inspection/presentation/widget/custom_chips.dart';
@@ -39,40 +38,44 @@ class InspectionMapPage extends GetView<InspectionMapLogic> {
mapController: controller.animatedMapController.mapController, mapController: controller.animatedMapController.mapController,
options: MapOptions( options: MapOptions(
initialCenter: currentLocation.value, initialCenter: currentLocation.value,
initialZoom: 18, interactionOptions: const InteractionOptions(
flags: InteractiveFlag.all & ~InteractiveFlag.rotate,
),
initialZoom: 15,
onPositionChanged: (camera, hasGesture) { onPositionChanged: (camera, hasGesture) {
controller.debouncedUpdateVisibleMarkers(center: camera.center); controller.debouncedUpdateVisibleMarkers(center: camera.center,zoom: camera.zoom);
}, },
), ),
children: [ children: [
TileLayer( TileLayer(
urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
userAgentPackageName: 'ir.mnpc.rasadyar', userAgentPackageName: 'ir.mnpc.rasadyar',
), ),
ObxValue((markers) { MarkerClusterLayerWidget(
return MarkerLayer( options: MarkerClusterLayerOptions(
markers: markers maxClusterRadius: 80,
.map( size: const Size(40, 40),
(e) => markerWidget( alignment: Alignment.center,
marker: LatLng(e.lat??0, e.long??0), padding: const EdgeInsets.all(50),
onTap: () { maxZoom: 15,
Get.bottomSheet( markers: controller.markers,
selectedLocationWidget2( builder: (context, markers) {
showHint: false, return Container(
sliderController: controller.slidController.value, decoration: BoxDecoration(
trigger: () {}, borderRadius: BorderRadius.circular(20),
toggle: () {}, color: Colors.blue,
), ),
isScrollControlled: true, child: Center(
enableDrag: true, child: Text(
backgroundColor: Colors.transparent, markers.length.toString(),
); style: const TextStyle(color: Colors.white),
},
), ),
) ),
.toList(), );
); },
}, controller.markers), ),
),
], ],
); );
}, controller.currentLocation), }, controller.currentLocation),
@@ -521,7 +524,6 @@ Widget cardWithLabel({
); );
} }
Widget selectedLocationWidget({ Widget selectedLocationWidget({
required bool showHint, required bool showHint,
required SlidableController sliderController, required SlidableController sliderController,

64
packages/inspection/pubspec.lock
View File

@@ -25,6 +25,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "5.3.0" version: "5.3.0"
animated_stack_widget:
dependency: transitive
description:
name: animated_stack_widget
sha256: ce4788dd158768c9d4388354b6fb72600b78e041a37afc4c279c63ecafcb9408
url: "https://pub.dev"
source: hosted
version: "0.0.4"
archive: archive:
dependency: transitive dependency: transitive
description: description:
@@ -233,14 +241,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.2.0" version: "1.2.0"
dart_polylabel2:
dependency: transitive
description:
name: dart_polylabel2
sha256: "7eeab15ce72894e4bdba6a8765712231fc81be0bd95247de4ad9966abc57adc6"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
dart_style: dart_style:
dependency: transitive dependency: transitive
description: description:
@@ -407,18 +407,34 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: flutter_map name: flutter_map
sha256: df33e784b09fae857c6261a5521dd42bd4d3342cb6200884bb70730638af5fd5 sha256: "2ecb34619a4be19df6f40c2f8dce1591675b4eff7a6857bd8f533706977385da"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "8.2.1" version: "7.0.2"
flutter_map_animations: flutter_map_animations:
dependency: transitive dependency: transitive
description: description:
name: flutter_map_animations name: flutter_map_animations
sha256: bf583863561861aaaf4854ae7ed8940d79bea7d32918bf7a85d309b25235a09e sha256: "08233f89919049a3601e785d32e9d1d9e1faac6578190150f1d7495fc1050d36"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.9.0" version: "0.8.0"
flutter_map_marker_cluster:
dependency: transitive
description:
name: flutter_map_marker_cluster
sha256: "2c1fb4d7a2105c4bbeb89be215320507f4b71b2036df4341fab9d2aa677d3ae9"
url: "https://pub.dev"
source: hosted
version: "1.4.0"
flutter_map_marker_popup:
dependency: transitive
description:
name: flutter_map_marker_popup
sha256: a7540538114b5d1627ab67b498273d66bc36090385412ae49ef215af4a2861c5
url: "https://pub.dev"
source: hosted
version: "7.0.0"
flutter_plugin_android_lifecycle: flutter_plugin_android_lifecycle:
dependency: transitive dependency: transitive
description: description:
@@ -973,6 +989,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.0.4" version: "1.0.4"
nested:
dependency: transitive
description:
name: nested
sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
node_preamble: node_preamble:
dependency: transitive dependency: transitive
description: description:
@@ -1157,6 +1181,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.9.1" version: "3.9.1"
polylabel:
dependency: transitive
description:
name: polylabel
sha256: "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b"
url: "https://pub.dev"
source: hosted
version: "1.0.1"
pool: pool:
dependency: transitive dependency: transitive
description: description:
@@ -1189,6 +1221,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.0" version: "2.1.0"
provider:
dependency: transitive
description:
name: provider
sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
url: "https://pub.dev"
source: hosted
version: "6.1.5"
pub_semver: pub_semver:
dependency: transitive dependency: transitive
description: description:

64
pubspec.lock
View File

@@ -25,6 +25,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "5.3.0" version: "5.3.0"
animated_stack_widget:
dependency: transitive
description:
name: animated_stack_widget
sha256: ce4788dd158768c9d4388354b6fb72600b78e041a37afc4c279c63ecafcb9408
url: "https://pub.dev"
source: hosted
version: "0.0.4"
archive: archive:
dependency: transitive dependency: transitive
description: description:
@@ -233,14 +241,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.2.0" version: "1.2.0"
dart_polylabel2:
dependency: transitive
description:
name: dart_polylabel2
sha256: "7eeab15ce72894e4bdba6a8765712231fc81be0bd95247de4ad9966abc57adc6"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
dart_style: dart_style:
dependency: transitive dependency: transitive
description: description:
@@ -415,18 +415,34 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: flutter_map name: flutter_map
sha256: df33e784b09fae857c6261a5521dd42bd4d3342cb6200884bb70730638af5fd5 sha256: "2ecb34619a4be19df6f40c2f8dce1591675b4eff7a6857bd8f533706977385da"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "8.2.1" version: "7.0.2"
flutter_map_animations: flutter_map_animations:
dependency: transitive dependency: transitive
description: description:
name: flutter_map_animations name: flutter_map_animations
sha256: bf583863561861aaaf4854ae7ed8940d79bea7d32918bf7a85d309b25235a09e sha256: "08233f89919049a3601e785d32e9d1d9e1faac6578190150f1d7495fc1050d36"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.9.0" version: "0.8.0"
flutter_map_marker_cluster:
dependency: transitive
description:
name: flutter_map_marker_cluster
sha256: "2c1fb4d7a2105c4bbeb89be215320507f4b71b2036df4341fab9d2aa677d3ae9"
url: "https://pub.dev"
source: hosted
version: "1.4.0"
flutter_map_marker_popup:
dependency: transitive
description:
name: flutter_map_marker_popup
sha256: a7540538114b5d1627ab67b498273d66bc36090385412ae49ef215af4a2861c5
url: "https://pub.dev"
source: hosted
version: "7.0.0"
flutter_plugin_android_lifecycle: flutter_plugin_android_lifecycle:
dependency: transitive dependency: transitive
description: description:
@@ -981,6 +997,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.0.4" version: "1.0.4"
nested:
dependency: transitive
description:
name: nested
sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
package_config: package_config:
dependency: transitive dependency: transitive
description: description:
@@ -1157,6 +1181,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.9.1" version: "3.9.1"
polylabel:
dependency: transitive
description:
name: polylabel
sha256: "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b"
url: "https://pub.dev"
source: hosted
version: "1.0.1"
pool: pool:
dependency: transitive dependency: transitive
description: description:
@@ -1189,6 +1221,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.0" version: "2.1.0"
provider:
dependency: transitive
description:
name: provider
sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
url: "https://pub.dev"
source: hosted
version: "6.1.5"
pub_semver: pub_semver:
dependency: transitive dependency: transitive
description: description: