Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
PROG2900
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sara Savanovic Djordjevic
PROG2900
Commits
2396207e
Commit
2396207e
authored
1 year ago
by
Sara Savanovic Djordjevic
Browse files
Options
Downloads
Patches
Plain Diff
update: move map to separate file
parent
fa338c76
No related branches found
Branches containing commit
No related tags found
1 merge request
!2
App2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/lib/pages/widgets/map_widget.dart
+3
-30
3 additions, 30 deletions
app/lib/pages/widgets/map_widget.dart
app/lib/pages/widgets/osm_map.dart
+7
-2
7 additions, 2 deletions
app/lib/pages/widgets/osm_map.dart
with
10 additions
and
32 deletions
app/lib/pages/widgets/map_widget.dart
+
3
−
30
View file @
2396207e
...
...
@@ -5,6 +5,7 @@ import 'package:flutter_map/flutter_map.dart';
import
'package:latlong2/latlong.dart'
;
import
'quick_view_chart.dart'
;
import
'stat_charts.dart'
;
import
'osm_map.dart'
;
class
MapContainerWidget
extends
StatefulWidget
{
final
List
<
Measurement
>
markerList
;
...
...
@@ -36,40 +37,12 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
const
SizedBox
(
height:
contPadding
),
ClipRRect
(
borderRadius:
BorderRadius
.
circular
(
20
),
child:
Stack
(
// Stack quick view
on top of map
child:
Stack
(
// Stack
of
quick view
, map layer, satellite layer, and buttons
children:
[
SizedBox
(
width:
screenWidth
*
boxWidth
,
height:
screenWidth
*
boxHeight
,
child:
FlutterMap
(
options:
MapOptions
(
center:
mapCenter
,
// From consts
zoom:
9.0
,
),
children:
[
TileLayer
(
// Map from OpenStreetMap
urlTemplate:
"https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
,
subdomains:
const
[
'a'
,
'b'
,
'c'
],
),
PolygonLayer
(
// Map each element in markerList to Measurement object
polygons:
widget
.
markerList
.
map
((
Measurement
measurement
)
{
return
Polygon
(
points:
measurement
.
cornerList
.
map
((
Corner
corner
)
{
// Map corner coordinates to LatLng objects
return
LatLng
(
corner
.
latitude
,
corner
.
longitude
);
})
.
toList
(),
/*onTap: () {
setState(() {
selectedMarker = measurement;
});
},*/
color:
Colors
.
blue
,
isFilled:
true
,
);
})
.
toList
(),
)
],
),
child:
OSMmap
(
markerList:
widget
.
markerList
),
// OpenStreetMap layer
),
Positioned
(
// Quick view box layered over map
bottom:
10
,
...
...
This diff is collapsed.
Click to expand it.
app/lib/pages/widgets/osm_map.dart
+
7
−
2
View file @
2396207e
...
...
@@ -5,7 +5,12 @@ import 'package:flutter_map/flutter_map.dart';
import
'package:latlong2/latlong.dart'
;
class
OSMmap
extends
StatelessWidget
{
const
OSMmap
({
super
.
key
});
final
List
<
Measurement
>
markerList
;
const
OSMmap
({
Key
?
key
,
required
this
.
markerList
,
})
:
super
(
key:
key
);
@override
Widget
build
(
BuildContext
context
)
{
...
...
@@ -20,7 +25,7 @@ class OSMmap extends StatelessWidget {
subdomains:
const
[
'a'
,
'b'
,
'c'
],
),
PolygonLayer
(
// Map each element in markerList to Measurement object
polygons:
widget
.
markerList
.
map
((
Measurement
measurement
)
{
polygons:
markerList
.
map
((
Measurement
measurement
)
{
return
Polygon
(
points:
measurement
.
cornerList
.
map
((
Corner
corner
)
{
// Map corner coordinates to LatLng objects
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment