Yandrik/uninav
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: partial broken guesture detection

Browse Source
This commit is contained in:
Yandrik
2024-04-20 21:14:11 +02:00
parent be359980bb
commit b7487fc25e
9 changed files with 3670 additions and 1369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
lib/components/map_render_level.dart
View File

@ -1,4 +1,6 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_map/flutter_map.dart';
import 'package:get/get.dart';
import 'package:latlong2/latlong.dart';
@ -7,7 +9,7 @@ import 'package:uninav/data/geo/model.dart';
import 'package:uninav/map.dart';
import 'package:uninav/util/geomath.dart';
List<Widget> renderLevel(int level) {
List<Widget> renderLevel(int level, {LayerHitNotifier? hitNotifier}) {
return <Widget>[
LevelLayer(
filter: (feature) =>
@ -18,55 +20,58 @@ List<Widget> renderLevel(int level) {
points: pts,
color: Colors.orange.withOpacity(0.2),
borderColor: Colors.orange,
isFilled: true,
borderStrokeWidth: 1,
borderStrokeWidth: 2,
hitValue: feature,
),
)
.unwrap(),
markerConstructor: (feature) => Marker(
width: 150,
height: 60,
width: 50,
height: 20,
point: feature.getPoint().unwrap(),
builder: (cx) => Center(
child: Column(
children: [
Icon(
Icons.class_,
color: Colors.black,
),
Text('${feature.name}'),
],
),
child: Column(
children: [
Icon(
Icons.class_,
color: Colors.black,
),
Text('${feature.name}'),
],
),
)),
alignment: Alignment.center,
),
notifier: hitNotifier),
LevelLayer(
filter: (feature) => feature.level == level && feature.type is Room,
polyConstructor: (feature) => feature
.getPolygon(
constructor: (pts) => Polygon(
points: pts,
color: Colors.green.withOpacity(0.2),
color: Colors.green.withOpacity(1.2),
borderColor: Colors.green,
isFilled: true,
borderStrokeWidth: 1,
borderStrokeWidth: 2,
hitValue: feature,
),
)
.unwrap(),
notifier: hitNotifier,
),
LevelLayer(
filter: (feature) => feature.level == level && feature.type is Door,
markerConstructor: (feature) {
final point = feature.getPoint().unwrap();
return Marker(
width: 20,
height: 20,
width: 21,
height: 21,
point: point,
builder: (ctx) => const Icon(
child: const Icon(
Icons.door_front_door,
color: Colors.brown,
),
alignment: Alignment.center,
);
},
notifier: hitNotifier,
),
LevelLayer(
filter: (feature) => feature.level == level && feature.type is Toilet,
@ -93,16 +98,17 @@ List<Widget> renderLevel(int level) {
final point = feature.getPoint().unwrap();
return Marker(
width: 20,
height: 20,
width: 21,
height: 21,
point: point,
builder: (ctx) => Icon(
child: Icon(
icon,
color: Colors.purple,
),
rotateAlignment: Alignment.center,
alignment: Alignment.center,
);
},
notifier: hitNotifier,
),
LevelLayer(
filter: (feature) =>
@ -111,15 +117,17 @@ List<Widget> renderLevel(int level) {
markerConstructor: (feature) {
final point = feature.getPoint().unwrap();
return Marker(
width: 20,
height: 20,
width: 21,
height: 21,
point: point,
builder: (ctx) => Icon(
child: Icon(
Icons.stairs_outlined,
color: Colors.deepPurple.shade300,
),
alignment: Alignment.center,
);
},
notifier: hitNotifier,
),
LevelLayer(
filter: (feature) =>
@ -128,15 +136,17 @@ List<Widget> renderLevel(int level) {
markerConstructor: (feature) {
final point = feature.getPoint().unwrap();
return Marker(
width: 20,
height: 20,
width: 21,
height: 21,
point: point,
builder: (ctx) => const Icon(
child: const Icon(
Icons.elevator_outlined,
color: Colors.deepPurple,
),
alignment: Alignment.center,
);
},
notifier: hitNotifier,
),
];
}
@ -147,6 +157,7 @@ class LevelLayer extends StatelessWidget {
final Marker Function(LatLng, String)? polyCenterMarkerConstructor;
final Marker Function(Feature)? markerConstructor;
final int? level;
final LayerHitNotifier? notifier;
const LevelLayer({
this.level,
@ -154,6 +165,7 @@ class LevelLayer extends StatelessWidget {
this.polyConstructor,
this.polyCenterMarkerConstructor,
this.markerConstructor,
this.notifier,
super.key,
});
@ -172,7 +184,15 @@ class LevelLayer extends StatelessWidget {
if (polyConstructor != null) {
filteredPolygons.add(polyConstructor!(feature));
} else {
filteredPolygons.add(feature.getPolygon().unwrap());
filteredPolygons.add(feature
.getPolygon(
constructor: (points) => Polygon(
points: points,
borderColor: Colors.black26,
borderStrokeWidth: 2.0,
hitValue: feature,
))
.unwrap());
}
// calculate polygon center
@ -186,7 +206,7 @@ class LevelLayer extends StatelessWidget {
width: 100,
height: 100,
point: center,
builder: (cx) => Center(
child: Center(
child: Text(
feature.name,
style: const TextStyle(
@ -195,6 +215,7 @@ class LevelLayer extends StatelessWidget {
),
),
),
alignment: Alignment.center,
));
}
} else if (feature.isPoint()) {
@ -206,7 +227,7 @@ class LevelLayer extends StatelessWidget {
width: 100,
height: 100,
point: point,
builder: (cx) => Center(
child: Center(
child: Text(
feature.name,
style: const TextStyle(
@ -215,6 +236,7 @@ class LevelLayer extends StatelessWidget {
),
),
),
alignment: Alignment.center,
));
}
}
@ -226,28 +248,39 @@ class LevelLayer extends StatelessWidget {
// print(filteredPolygons[0].points[0]);
// print(myMapController.features.length);
// filteredPolygons.forEach((element) {
// print(element.hitValue);
// });
final List<Widget> widgets = [];
if (filteredPolygons.isNotEmpty) {
if (polyConstructor != null) {
widgets.add(PolygonLayer(polygons: filteredPolygons));
widgets.add(TranslucentPointer(
child: PolygonLayer(
polygons: filteredPolygons,
hitNotifier: notifier,
),
));
} else {
widgets.add(PolygonLayer(
polygons: filteredPolygons
.map((poly) => Polygon(
points: poly.points,
borderColor: Colors.black26,
borderStrokeWidth: 2.0,
))
.toList()));
widgets.add(TranslucentPointer(
child: PolygonLayer(
polygons: filteredPolygons,
hitNotifier: notifier,
),
));
}
widgets.add(MarkerLayer(
markers: polygonCenterMarkers,
rotate: true,
widgets.add(TranslucentPointer(
child: MarkerLayer(
markers: polygonCenterMarkers,
rotate: true,
),
));
}
if (filteredMarkers.isNotEmpty) {
widgets.add(MarkerLayer(markers: filteredMarkers, rotate: true));
widgets.add(TranslucentPointer(
child: MarkerLayer(markers: filteredMarkers, rotate: true),
));
}
return Stack(children: widgets);

15
lib/controllers/map_controller.dart
View File

@ -1,7 +1,7 @@
import 'dart:convert';
import 'package:anyhow/anyhow.dart';
import 'package:geojson/geojson.dart';
import 'package:geojson_vi/geojson_vi.dart';
import 'package:get/get.dart';
import 'package:uninav/data/geo/model.dart';
import 'package:uninav/data/geo/parser.dart';
@ -46,14 +46,17 @@ class MyMapController extends GetxController {
final featuresList = <Feature>[];
final geojson = GeoJson();
await geojson.parse(geoJsonString);
print('doing');
final geojson = GeoJSONFeatureCollection.fromJSON(geoJsonString);
print('done');
for (final feature in geojson.features) {
print(feature);
print(feature?.properties);
if (feature == null) continue;
print(feature.properties);
final parsed =
parseFeature(feature.properties ?? <String, dynamic>{}, feature);
final parsed = parseFeature(
feature.properties ?? <String, dynamic>{}, feature.geometry);
if (parsed case Ok(:final ok)) {
featuresList.add(ok);
}

26
lib/data/geo/model.dart
View File

@ -2,7 +2,7 @@ import 'package:anyhow/anyhow.dart';
import 'package:flutter/material.dart';
import 'package:flutter_map/flutter_map.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:geojson/geojson.dart';
import 'package:geojson_vi/geojson_vi.dart';
import 'package:latlong2/latlong.dart';
part 'model.freezed.dart';
@ -15,27 +15,30 @@ class Feature with _$Feature {
required String name,
required FeatureType type,
String? description,
required dynamic geometry,
required GeoJSONGeometry geometry,
int? level,
}) = _Feature;
bool isPolygon() {
return geometry is GeoJsonFeature<GeoJsonPolygon>;
return geometry is GeoJSONPolygon;
}
bool isPoint() {
return geometry is GeoJsonFeature<GeoJsonPoint>;
return geometry is GeoJSONPoint;
}
Result<Polygon> getPolygon({Polygon Function(List<LatLng>)? constructor}) {
if (isPolygon()) {
constructor ??= (pts) => Polygon(
points: pts, borderColor: Colors.black26, borderStrokeWidth: 2.0);
final polygon = geometry as GeoJsonFeature<GeoJsonPolygon>;
points: pts,
borderColor: Colors.black26,
borderStrokeWidth: 2.0,
);
final polygon = geometry as GeoJSONPolygon;
// print(polygon.geometry!.geoSeries[0].geoPoints);
final points = polygon.geometry!.geoSeries[0].geoPoints
.map((e) => LatLng(e.latitude, e.longitude))
.toList();
final points =
// polygon.coordinates[0].map((e) => LatLng(e[0], e[1])).toList();
polygon.coordinates[0].map((e) => LatLng(e[1], e[0])).toList();
// print(points);
return Ok(constructor(points));
@ -46,9 +49,8 @@ class Feature with _$Feature {
Result<LatLng> getPoint() {
if (isPoint()) {
final point = geometry as GeoJsonFeature<GeoJsonPoint>;
return Ok(LatLng(point.geometry!.geoPoint.latitude,
point.geometry!.geoPoint.longitude));
final point = geometry as GeoJSONPoint;
return Ok(LatLng(point.coordinates[1], point.coordinates[0]));
} else {
return bail("Feature Geometry is not a Point");
}

4
lib/data/geo/parser.dart
View File

@ -1,10 +1,10 @@
import 'package:anyhow/anyhow.dart';
import 'package:geojson/geojson.dart';
import 'package:geojson_vi/geojson_vi.dart';
import 'package:uninav/data/geo/model.dart';
import 'package:yaml/yaml.dart';
Result<Feature> parseFeature(
Map<String, dynamic> properties, dynamic geometry) {
Map<String, dynamic> properties, GeoJSONGeometry geometry) {
final name = properties['name'] as String?;
final description_yaml = properties['description'] as String? ?? '';
final layer = properties['layer'] as String?;

372
lib/map.dart
View File

@ -2,12 +2,12 @@ import 'package:anim_search_bar/anim_search_bar.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_map/flutter_map.dart';
import 'package:flutter_map/plugin_api.dart';
import 'package:get/get.dart';
import 'package:latlong2/latlong.dart';
import 'package:rust_core/slice.dart';
import 'package:uninav/components/drawer.dart';
import 'package:uninav/components/hamburger_menu.dart';
import 'package:uninav/components/map_render_level.dart';
import 'package:uninav/controllers/map_controller.dart';
import 'package:uninav/data/geo/model.dart';
import 'package:uninav/util/geomath.dart';
@ -18,6 +18,7 @@ class MapPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
final LayerHitNotifier hitNotifier = ValueNotifier(null);
return Scaffold(
drawer: MyDrawer(),
appBar: AppBar(
@ -51,64 +52,95 @@ class MapPage extends StatelessWidget {
FlutterMap(
mapController: MapController(),
options: MapOptions(
center: LatLng(48.422766, 9.9564),
zoom: 16.0,
initialCenter: const LatLng(48.422766, 9.9564),
initialZoom: 16.0,
// camera constraints
maxZoom: 19,
onTap: (tapPosition, latlng) => print(tapPosition),
),
children: [
TileLayer(
urlTemplate: "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
maxZoom: 19,
),
GestureDetector(
onTap: () {
print("tap");
final LayerHitResult? hit = hitNotifier.value;
if (hit == null) {
return;
}
// buildings
LevelLayer(
filter: (feature) => feature.type is Building,
),
print("not null");
print(hit.coordinate);
hit.printInfo();
print(hit.hitValues);
// public transport
LevelLayer(
filter: (feature) =>
feature.level == null && feature.type is PublicTransport,
polyCenterMarkerConstructor: (center, name) => Marker(
width: 100,
height: 100,
point: center,
builder: (cx) => const Center(
child: Icon(
Icons.train,
color: Colors.black,
),
for (final hitValue in hit.hitValues) {
print(hitValue);
}
// Handle the hit, which in this case is a tap
// For example, see the example in Hit Handling (below)
},
child: MouseRegion(
cursor: SystemMouseCursors.click,
child: Stack(
children: [
// buildings
LevelLayer(
filter: (feature) => feature.type is Building,
notifier: hitNotifier,
),
// public transport
LevelLayer(
filter: (feature) =>
feature.level == null &&
feature.type is PublicTransport,
polyCenterMarkerConstructor: (center, name) => Marker(
width: 100,
height: 100,
point: center,
child: const Icon(
Icons.train,
color: Colors.black,
),
alignment: Alignment.center,
),
polyConstructor: (feature) => feature
.getPolygon(
constructor: (pts) => Polygon(
points: pts,
color: Colors.green.withOpacity(0.2),
borderColor: Colors.green,
borderStrokeWidth: 1,
hitValue: feature,
))
.unwrap(),
notifier: hitNotifier,
),
// current level
Obx(
() => Stack(
children: renderLevel(
Get.find<MyMapController>()
.currentLevel
.value,
hitNotifier: hitNotifier)),
),
// RichAttributionWidget(attributions: [
// TextSourceAttribution(
// 'OpenStreetMap contributors',
// onTap: () =>
// launchUrl(Uri.parse('https://openstreetmap.org/copyright')),
// )
// ]),
],
),
),
polyConstructor: (feature) => feature
.getPolygon(
constructor: (pts) => Polygon(
points: pts,
color: Colors.green.withOpacity(0.2),
borderColor: Colors.green,
isFilled: true,
borderStrokeWidth: 1,
))
.unwrap(),
),
// current level
Obx(
() => Stack(
children: renderLevel(
Get.find<MyMapController>().currentLevel.value),
),
)
// RichAttributionWidget(attributions: [
// TextSourceAttribution(
// 'OpenStreetMap contributors',
// onTap: () =>
// launchUrl(Uri.parse('https://openstreetmap.org/copyright')),
// )
// ]),
],
),
Positioned(
@ -152,251 +184,3 @@ class MapPage extends StatelessWidget {
));
}
}
List<Widget> renderLevel(int level) {
return <Widget>[
LevelLayer(
filter: (feature) =>
feature.level == level && feature.type is LectureHall,
polyConstructor: (feature) => feature
.getPolygon(
constructor: (pts) => Polygon(
points: pts,
color: Colors.orange.withOpacity(0.2),
borderColor: Colors.orange,
isFilled: true,
borderStrokeWidth: 1,
),
)
.unwrap(),
markerConstructor: (feature) => Marker(
width: 150,
height: 60,
point: feature.getPoint().unwrap(),
builder: (cx) => Center(
child: Column(
children: [
Icon(
Icons.class_,
color: Colors.black,
),
Text('${feature.name}'),
],
),
),
)),
LevelLayer(
filter: (feature) => feature.level == level && feature.type is Room,
polyConstructor: (feature) => feature
.getPolygon(
constructor: (pts) => Polygon(
points: pts,
color: Colors.green.withOpacity(0.2),
borderColor: Colors.green,
isFilled: true,
borderStrokeWidth: 1,
),
)
.unwrap(),
),
LevelLayer(
filter: (feature) => feature.level == level && feature.type is Door,
markerConstructor: (feature) {
final point = feature.getPoint().unwrap();
return Marker(
width: 20,
height: 20,
point: point,
builder: (ctx) => const Icon(
Icons.door_front_door,
color: Colors.brown,
),
);
},
),
LevelLayer(
filter: (feature) => feature.level == level && feature.type is Toilet,
markerConstructor: (feature) {
final type = (feature.type as Toilet).toilet_type;
IconData icon;
switch (type.toLowerCase()) {
case 'male':
icon = Icons.male;
break;
case 'female':
icon = Icons.female;
break;
case 'handicap':
icon = Icons.wheelchair_pickup;
break;
default:
print("WARN: Toilet didn't have recognizable type! "
"(Level ${feature.level}, Name ${feature.name}, "
"Location: ${feature.getPoint().unwrap()})");
icon = Icons.wc;
break;
}
final point = feature.getPoint().unwrap();
return Marker(
width: 20,
height: 20,
point: point,
builder: (ctx) => Icon(
icon,
color: Colors.purple,
),
rotateAlignment: Alignment.center,
);
},
),
LevelLayer(
filter: (feature) =>
feature.type is Stairs &&
(feature.type as Stairs).connects_levels.contains(level),
markerConstructor: (feature) {
final point = feature.getPoint().unwrap();
return Marker(
width: 20,
height: 20,
point: point,
builder: (ctx) => Icon(
Icons.stairs_outlined,
color: Colors.deepPurple.shade300,
),
);
},
),
LevelLayer(
filter: (feature) =>
feature.type is Lift &&
(feature.type as Lift).connects_levels.contains(level),
markerConstructor: (feature) {
final point = feature.getPoint().unwrap();
return Marker(
width: 20,
height: 20,
point: point,
builder: (ctx) => const Icon(
Icons.elevator_outlined,
color: Colors.deepPurple,
),
);
},
),
];
}
class LevelLayer extends StatelessWidget {
final bool Function(Feature)? filter;
final Polygon Function(Feature)? polyConstructor;
final Marker Function(LatLng, String)? polyCenterMarkerConstructor;
final Marker Function(Feature)? markerConstructor;
final int? level;
const LevelLayer({
this.level,
this.filter,
this.polyConstructor,
this.polyCenterMarkerConstructor,
this.markerConstructor,
super.key,
});
@override
Widget build(BuildContext context) {
final myMapController = Get.find<MyMapController>();
return Obx(() {
final List<Polygon> filteredPolygons = [];
final List<Marker> polygonCenterMarkers = [];
final List<Marker> filteredMarkers = [];
for (final feature in myMapController.features) {
if (filter == null || filter!(feature)) {
if (feature.isPolygon()) {
if (polyConstructor != null) {
filteredPolygons.add(polyConstructor!(feature));
} else {
filteredPolygons.add(feature.getPolygon().unwrap());
}
// calculate polygon center
final center =
polygonCenterMinmax(feature.getPolygon().unwrap().points);
if (polyCenterMarkerConstructor != null) {
polygonCenterMarkers
.add(polyCenterMarkerConstructor!(center, feature.name));
} else {
polygonCenterMarkers.add(Marker(
width: 100,
height: 100,
point: center,
builder: (cx) => Center(
child: Text(
feature.name,
style: const TextStyle(
color: Colors.black54,
// backgroundColor: Colors.white,
),
),
),
));
}
} else if (feature.isPoint()) {
if (markerConstructor != null) {
filteredMarkers.add(markerConstructor!(feature));
} else {
final point = feature.getPoint().unwrap();
filteredMarkers.add(Marker(
width: 100,
height: 100,
point: point,
builder: (cx) => Center(
child: Text(
feature.name,
style: const TextStyle(
color: Colors.black54,
// backgroundColor: Colors.white,
),
),
),
));
}
}
}
}
// print(filteredPolygons.length);
// print(filteredPolygons);
// print(filteredPolygons[0].points[0]);
// print(myMapController.features.length);
final List<Widget> widgets = [];
if (filteredPolygons.isNotEmpty) {
if (polyConstructor != null) {
widgets.add(PolygonLayer(polygons: filteredPolygons));
} else {
widgets.add(PolygonLayer(
polygons: filteredPolygons
.map((poly) => Polygon(
points: poly.points,
borderColor: Colors.black26,
borderStrokeWidth: 2.0,
))
.toList()));
}
widgets.add(MarkerLayer(
markers: polygonCenterMarkers,
rotate: true,
));
}
if (filteredMarkers.isNotEmpty) {
widgets.add(MarkerLayer(markers: filteredMarkers, rotate: true));
}
return Stack(children: widgets);
});
}
}