vjrj
2486465e44
Maps were not rendering in flutter_map v6.2.1 because TileLayer was missing the required userAgentPackageName property. This property is needed for proper HTTP requests to tile servers with correct User-Agent headers. - Updated TileLayer in genericMap.dart with userAgentPackageName - Updated TileLayer in monitoredAreas.dart with userAgentPackageName - Fixes: Maps not displaying tiles after flutter_map v6 migration
470 lines
19 KiB
Dart
470 lines
19 KiB
Dart
import 'dart:core';
|
|
|
|
import 'package:comunes_flutter/comunes_flutter.dart';
|
|
import 'package:fires_flutter/models/yourLocation.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter_map/flutter_map.dart';
|
|
import 'package:flutter_redux/flutter_redux.dart';
|
|
import 'package:latlong2/latlong.dart';
|
|
import 'package:share_plus/share_plus.dart';
|
|
|
|
import 'attributionMapPlugin.dart';
|
|
import 'colors.dart';
|
|
import 'customMoment.dart';
|
|
import 'dummyMapPlugin.dart';
|
|
import 'fireMarkType.dart';
|
|
import 'fireMarker.dart';
|
|
import 'generated/i18n.dart';
|
|
import 'genericMapBottom.dart';
|
|
import 'globals.dart' as globals;
|
|
import 'layerSelectorMapPlugin.dart';
|
|
import 'locationUtils.dart';
|
|
import 'models/appState.dart';
|
|
import 'redux/actions.dart';
|
|
import 'sentryReport.dart';
|
|
import 'slider.dart';
|
|
import 'zoomMapPlugin.dart';
|
|
|
|
@immutable
|
|
class _ViewModel {
|
|
final String serverUrl;
|
|
final String lang;
|
|
final FireMapState mapState;
|
|
final OnSubscribeFunction onSubs;
|
|
final OnSubscribeConfirmedFunction onSubsConfirmed;
|
|
final OnUnSubscribeFunction onUnSubs;
|
|
final OnSubscribeDistanceChangeFunction onSlide;
|
|
final OnLocationEdit onEdit;
|
|
final OnLocationEditConfirm onEditConfirm;
|
|
final OnLocationEditCancel onEditCancel;
|
|
final OnLocationEditing onEditing;
|
|
final OnFalsePositive onFalsePositive;
|
|
final OnFirePressedInMap onFirePressed;
|
|
|
|
_ViewModel(
|
|
{required this.mapState,
|
|
required this.serverUrl,
|
|
required this.lang,
|
|
required this.onSubs,
|
|
required this.onSubsConfirmed,
|
|
required this.onUnSubs,
|
|
required this.onSlide,
|
|
required this.onEdit,
|
|
required this.onEditing,
|
|
required this.onEditConfirm,
|
|
required this.onFalsePositive,
|
|
required this.onFirePressed,
|
|
required this.onEditCancel});
|
|
|
|
@override
|
|
bool operator ==(Object other) =>
|
|
identical(this, other) ||
|
|
other is _ViewModel &&
|
|
runtimeType == other.runtimeType &&
|
|
serverUrl == other.serverUrl &&
|
|
lang == other.lang &&
|
|
mapState == other.mapState;
|
|
|
|
@override
|
|
int get hashCode => serverUrl.hashCode ^ lang.hashCode ^ mapState.hashCode;
|
|
}
|
|
|
|
class genericMap extends StatefulWidget {
|
|
@override
|
|
_genericMapState createState() => _genericMapState();
|
|
}
|
|
|
|
class _genericMapState extends State<genericMap> {
|
|
// This needs to be stateful so when resizes don't get a new globalkey
|
|
// https://github.com/flutter/flutter/issues/1632#issuecomment-180478202
|
|
final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
|
|
|
|
YourLocation? _location;
|
|
YourLocation? _initialLocation;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return new StoreConnector<AppState, _ViewModel>(
|
|
distinct: true,
|
|
onInitialBuild: (store) {
|
|
_initialLocation = _location?.copyWith();
|
|
},
|
|
converter: (store) {
|
|
print('New map viewer');
|
|
return new _ViewModel(
|
|
onSubs: (loc) {
|
|
store.dispatch(new SubscribeAction());
|
|
},
|
|
onSubsConfirmed: (loc) {
|
|
loc.subscribed = true;
|
|
store.dispatch(new SubscribeConfirmAction(loc));
|
|
},
|
|
onUnSubs: (loc) {
|
|
loc.subscribed = false;
|
|
store.dispatch(new UnSubscribeAction(loc));
|
|
},
|
|
onSlide: (loc) {
|
|
store.dispatch(new UpdateYourLocationMapAction(loc));
|
|
},
|
|
onEdit: (loc) => store.dispatch(new EditYourLocationAction(loc)),
|
|
onEditing: (loc) {
|
|
store.dispatch(new UpdateYourLocationMapAction(loc));
|
|
},
|
|
onEditCancel: (loc) =>
|
|
store.dispatch(new EditCancelYourLocationAction(loc)),
|
|
onEditConfirm: (loc) {
|
|
store.dispatch(new UpdateYourLocationAction(loc));
|
|
store.dispatch(new UpdateYourLocationMapAction(loc));
|
|
store.dispatch(new EditConfirmYourLocationAction(loc));
|
|
},
|
|
onFalsePositive: (notif, type) => store
|
|
.dispatch(new MarkFireAsFalsePositiveAction(notif, type)),
|
|
onFirePressed: (LatLng latLng, DateTime when, type) {
|
|
_showFireDialog(latLng, when, type);
|
|
},
|
|
serverUrl: store.state.serverUrl,
|
|
// Not used yet, but maybe in the future for date format
|
|
lang: store.state.user.lang,
|
|
mapState: store.state.fireMapState);
|
|
},
|
|
builder: (context, view) {
|
|
YourLocation? location = view.mapState.yourLocation;
|
|
_location = location?.copyWith();
|
|
print('New map builder with ${_location?.description}');
|
|
|
|
FireMapState mapState = view.mapState;
|
|
FireMapStatus status = mapState.status;
|
|
FireMapLayer layer = mapState.layer;
|
|
print('Build map with status: $status and layer $layer');
|
|
|
|
double maxZoom = 18.0; // works?
|
|
|
|
MapOptions mapOptions = new MapOptions(
|
|
initialCenter:
|
|
new LatLng(_location?.lat ?? 0.0, _location?.lon ?? 0.0),
|
|
initialZoom: 13.0,
|
|
maxZoom: maxZoom,
|
|
onTap: (tapPosition, latLng) {
|
|
if (status == FireMapStatus.edit && _location != null) {
|
|
_location = _location!
|
|
.copyWith(lat: latLng.latitude, lon: latLng.longitude);
|
|
view.onEditing(_location!);
|
|
}
|
|
},
|
|
// onPositionChanged: (positionCallback) {
|
|
// print('${positionCallback.center}, ${positionCallback.zoom}');
|
|
//}
|
|
);
|
|
var mapController = new MapController();
|
|
|
|
// mapController.fitBounds(bounds);
|
|
// mapController.center
|
|
|
|
final btnText = status == FireMapStatus.view
|
|
? S.of(context).toFiresNotifications
|
|
: status == FireMapStatus.subscriptionConfirm
|
|
? S.of(context).confirm
|
|
: S.of(context).unsubscribe;
|
|
final btnIcon = status == FireMapStatus.view
|
|
? Icons.notifications_active
|
|
: status == FireMapStatus.subscriptionConfirm
|
|
? Icons.check
|
|
: Icons.notifications_off;
|
|
|
|
String baseLayer;
|
|
List<String> subdomains = [];
|
|
String attribution;
|
|
switch (layer) {
|
|
case FireMapLayer.osmc:
|
|
case FireMapLayer.osmcGrey:
|
|
attribution = '© OpenStreetMap contributors';
|
|
break;
|
|
case FireMapLayer.esri:
|
|
case FireMapLayer.esriSatellite:
|
|
case FireMapLayer.esriTerrain:
|
|
attribution = '© ESRI';
|
|
}
|
|
/* tiles from: https://github.com/dceejay/RedMap/blob/1914ed3b9ce4e8a496049849a93282730b4fff02/worldmap/index.html */
|
|
switch (layer) {
|
|
case FireMapLayer.osmc:
|
|
subdomains = ['a', 'b', 'c'];
|
|
baseLayer =
|
|
'https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png';
|
|
break;
|
|
case FireMapLayer.osmcGrey:
|
|
subdomains = ['a', 'b', 'c'];
|
|
baseLayer = 'https://tiles.wmflabs.org/bw-mapnik/{z}/{x}/{y}.png';
|
|
break;
|
|
case FireMapLayer.esri:
|
|
baseLayer =
|
|
'https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}';
|
|
break;
|
|
case FireMapLayer.esriSatellite:
|
|
baseLayer =
|
|
'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}';
|
|
break;
|
|
case FireMapLayer.esriTerrain:
|
|
baseLayer =
|
|
'https://server.arcgisonline.com/ArcGIS/rest/services/World_Shaded_Relief/MapServer/tile/{z}/{y}/{x}';
|
|
}
|
|
FlutterMap map = new FlutterMap(
|
|
options: mapOptions,
|
|
children: [
|
|
new TileLayer(
|
|
maxZoom: maxZoom,
|
|
urlTemplate: baseLayer,
|
|
subdomains: subdomains,
|
|
userAgentPackageName: 'com.example.fires_flutter',
|
|
additionalOptions: {
|
|
// 'opacity': '0.1',
|
|
},
|
|
),
|
|
globals.isDevelopment
|
|
? new ZoomMapPluginWidget()
|
|
: new DummyMapPluginWidget(),
|
|
new MarkerLayer(
|
|
markers: buildMarkers(
|
|
mapState.status == FireMapStatus.viewFireNotification &&
|
|
mapState.fireNotification != null
|
|
? new LatLng(mapState.fireNotification!.lat,
|
|
mapState.fireNotification!.lon)
|
|
: new LatLng(_location!.lat, _location!.lon),
|
|
mapState.fires,
|
|
mapState.industries,
|
|
mapState.falsePos,
|
|
mapState.status == FireMapStatus.viewFireNotification,
|
|
view.onFirePressed),
|
|
),
|
|
// new AttributionPluginWidget(text: "© OpenStreetMap contributors"),
|
|
new LayerSelectorMapPluginWidget(),
|
|
new AttributionPluginWidget(text: attribution),
|
|
],
|
|
);
|
|
// mapController.
|
|
/* FlutterMapState leafletState = map.createState();
|
|
leafletState.mapState.onMoved.listen((Null) {
|
|
|
|
;
|
|
}); */
|
|
// Do something with it
|
|
return new Scaffold(
|
|
key: _scaffoldKey,
|
|
resizeToAvoidBottomInset: true,
|
|
appBar: new AppBar(
|
|
title: status == FireMapStatus.edit
|
|
? new TextField(
|
|
// autofocus: true,
|
|
key: new Key('LocationDescField'),
|
|
keyboardType: TextInputType.text,
|
|
|
|
decoration: new InputDecoration(),
|
|
controller: new TextEditingController.fromValue(
|
|
new TextEditingValue(
|
|
text: _location!.description,
|
|
selection: new TextSelection.collapsed(
|
|
offset: _location!.description.length))),
|
|
onChanged: (newDesc) {
|
|
debugPrint("OnChanged");
|
|
_location = _location!.copyWith(description: newDesc);
|
|
},
|
|
onSubmitted: (newDesc) {
|
|
debugPrint("OnSubmitted");
|
|
_location = _location!.copyWith(description: newDesc);
|
|
view.onEditConfirm(_location!);
|
|
},
|
|
)
|
|
: status == FireMapStatus.viewFireNotification
|
|
? new Text(S.of(context).fireNotificationTitle)
|
|
: new Text(_location!.description),
|
|
actions: buildAppBarActions(status, view, _location!),
|
|
),
|
|
floatingActionButton: status == FireMapStatus.edit ||
|
|
status == FireMapStatus.viewFireNotification
|
|
? null
|
|
: FloatingActionButton.extended(
|
|
onPressed: () {
|
|
switch (status) {
|
|
case FireMapStatus.view:
|
|
view.onSubs(_location!);
|
|
break;
|
|
case FireMapStatus.subscriptionConfirm:
|
|
view.onSubsConfirmed(_location!);
|
|
break;
|
|
case FireMapStatus.unsubscribe:
|
|
view.onUnSubs(_location!);
|
|
break;
|
|
case FireMapStatus.edit:
|
|
case FireMapStatus.viewFireNotification:
|
|
break;
|
|
}
|
|
},
|
|
// https://github.com/flutter/flutter/issues/17583
|
|
heroTag: "firesmap" + _location!.id.hexString,
|
|
icon: new Icon(btnIcon, color: fires600),
|
|
label: new Text(
|
|
btnText,
|
|
style: const TextStyle(color: fires600),
|
|
),
|
|
backgroundColor: Colors.white,
|
|
),
|
|
floatingActionButtonLocation:
|
|
FloatingActionButtonLocation.centerFloat,
|
|
bottomNavigationBar: new GenericMapBottom(
|
|
onSave: () => view.onEditConfirm(_location!),
|
|
onCancel: () =>
|
|
view.onEditCancel(_initialLocation ?? _location!),
|
|
onFalsePositive: (sealed, type) =>
|
|
view.onFalsePositive(sealed, type),
|
|
state: view.mapState,
|
|
scaffoldKey: _scaffoldKey,
|
|
),
|
|
body: LayoutBuilder(
|
|
builder: (context, constraints) =>
|
|
Stack(fit: StackFit.expand, children: <Widget>[
|
|
// Material(color: Colors.yellowAccent),
|
|
new Opacity(
|
|
opacity:
|
|
status == FireMapStatus.subscriptionConfirm ||
|
|
status == FireMapStatus.edit
|
|
? 0.5
|
|
: 1.0,
|
|
child: map),
|
|
Positioned(
|
|
top: constraints.maxHeight - 200,
|
|
right: 10.0,
|
|
left: 10.0,
|
|
child: new CenteredRow(
|
|
// Fit sample:
|
|
// https://github.com/apptreesoftware/flutter_map/blob/master/flutter_map_example/lib/pages/map_controller.dart
|
|
children: status ==
|
|
FireMapStatus.subscriptionConfirm ||
|
|
(status == FireMapStatus.edit &&
|
|
_location != null &&
|
|
_location!.subscribed)
|
|
? <Widget>[
|
|
new FireDistanceSlider(
|
|
initialValue:
|
|
(_location?.distance ?? 0)
|
|
.round(),
|
|
onSlide: (distance) {
|
|
if (_location != null) {
|
|
_location!.distance = distance;
|
|
view.onSlide(_location!);
|
|
}
|
|
})
|
|
]
|
|
: []),
|
|
)
|
|
])));
|
|
});
|
|
}
|
|
|
|
List<Widget> buildAppBarActions(
|
|
FireMapStatus status, _ViewModel view, YourLocation location) {
|
|
switch (status) {
|
|
case FireMapStatus.view:
|
|
case FireMapStatus.unsubscribe:
|
|
return <Widget>[
|
|
new IconButton(
|
|
icon: new Icon(Icons.edit),
|
|
onPressed: () => view.onEdit(location))
|
|
];
|
|
case FireMapStatus.edit:
|
|
return <Widget>[
|
|
new IconButton(
|
|
icon: new Icon(Icons.save),
|
|
onPressed: () => view.onEditConfirm(_location!))
|
|
];
|
|
case FireMapStatus.viewFireNotification:
|
|
return <Widget>[
|
|
new IconButton(
|
|
icon: new Icon(Icons.share),
|
|
onPressed: () {
|
|
Share.share(
|
|
'${view.mapState.fireNotification?.description ?? 'Fire'}. ${view.serverUrl}fire/${view.mapState.fireNotification?.sealed ?? ''}');
|
|
})
|
|
];
|
|
default:
|
|
return <Widget>[];
|
|
}
|
|
}
|
|
|
|
List<Marker> buildMarkers(
|
|
LatLng pos,
|
|
List<dynamic> fires,
|
|
List<dynamic> falsePosList,
|
|
List<dynamic> industries,
|
|
bool isNotif,
|
|
OnFirePressedInMap onFirePressed) {
|
|
List<Marker> markers = [];
|
|
print(
|
|
'building markers: fires: ${fires.length} falsePos: ${falsePosList.length} industries: ${industries.length}, isNotif: $isNotif ');
|
|
const calibrate = false; // useful when we change the fire icons size
|
|
falsePosList.forEach((falsePos) {
|
|
try {
|
|
var coords = falsePos['geo']['coordinates'];
|
|
// print('false pos: ${coords}');
|
|
var loc = LatLng(coords[1].toDouble(), coords[0].toDouble());
|
|
markers.add(FireMarker(loc, FireMarkType.falsePos));
|
|
if (calibrate) markers.add(FireMarker(loc, FireMarkType.pixel));
|
|
} catch (e, stackTrace) {
|
|
print('Failed to process $falsePos');
|
|
reportError(e, stackTrace);
|
|
}
|
|
});
|
|
industries.forEach((industry) {
|
|
try {
|
|
// print(fire['geo']['coordinates']);
|
|
var coords = industry['geo']['coordinates'];
|
|
var loc = LatLng(coords[1], coords[0]);
|
|
markers.add(FireMarker(loc, FireMarkType.industry));
|
|
if (calibrate) markers.add(FireMarker(loc, FireMarkType.pixel));
|
|
} catch (e, stackTrace) {
|
|
print('Failed to process $industry');
|
|
reportError(e, stackTrace);
|
|
}
|
|
});
|
|
fires.forEach((fire) {
|
|
try {
|
|
var loc = new LatLng(fire['lat'], fire['lon']);
|
|
markers.add(FireMarker(loc, FireMarkType.fire, () {
|
|
onFirePressed(loc, DateTime.parse(fire['when']), fire['type']);
|
|
print('fire $fire pressed');
|
|
}));
|
|
markers.add(FireMarker(loc, FireMarkType.pixel));
|
|
} catch (e, stackTrace) {
|
|
print('Failed to process $fire');
|
|
reportError(e, stackTrace);
|
|
}
|
|
});
|
|
markers.add(
|
|
FireMarker(pos, isNotif ? FireMarkType.fire : FireMarkType.position));
|
|
if (calibrate) markers.add(FireMarker(pos, FireMarkType.pixel));
|
|
return markers;
|
|
}
|
|
|
|
void _showFireDialog(LatLng pos, DateTime date, String type) {
|
|
var when = Moment.fromDate(date).fromNow(context);
|
|
getReverseLocation(lat: pos.latitude, lon: pos.longitude)
|
|
.then((reverseLoc) {
|
|
String by = type == 'vecinal'
|
|
? S.of(context).byOurUsers
|
|
: S.of(context).byNASAsatellites;
|
|
String fireDesc =
|
|
S.of(context).additionalInfoAboutFire(reverseLoc, when, by);
|
|
showDialog<bool>(
|
|
context: _scaffoldKey.currentContext!,
|
|
builder: (_) => new AlertDialog(
|
|
content: new Text(fireDesc),
|
|
actions: <Widget>[
|
|
new TextButton(
|
|
child: Text(S.of(context).CLOSE),
|
|
onPressed: () {
|
|
Navigator.pop(context);
|
|
},
|
|
),
|
|
],
|
|
));
|
|
});
|
|
}
|
|
}
|