vjrj
7dbcf1e82c
tiles.wmflabs.org was causing DNS resolution failures on the device/emulator (No address associated with hostname, errno = 7). Replaced with the official OpenStreetMap tile server (tile.openstreetmap.org) which is more stable and reliable. Removed subdomains configuration as it's not needed for the official OSM server. - Updated FireMapLayer.osmcGrey in genericMap.dart - Updated TileLayer in monitoredAreas.dart - Fixes: Map tiles not loading due to network/DNS issues
98 lines
3.7 KiB
Dart
98 lines
3.7 KiB
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 'colors.dart';
|
|
import 'customBottomAppBar.dart';
|
|
import 'generated/i18n.dart';
|
|
import 'mainDrawer.dart';
|
|
import 'models/appState.dart';
|
|
import 'firesSpinner.dart';
|
|
|
|
class _ViewModel {
|
|
List<Polyline> monitoredAreas;
|
|
|
|
_ViewModel(this.monitoredAreas);
|
|
|
|
@override
|
|
bool operator ==(Object other) =>
|
|
identical(this, other) ||
|
|
other is _ViewModel &&
|
|
runtimeType == other.runtimeType &&
|
|
monitoredAreas == other.monitoredAreas;
|
|
|
|
@override
|
|
int get hashCode => monitoredAreas.hashCode;
|
|
}
|
|
|
|
class MonitoredAreasPage extends StatelessWidget {
|
|
static const String routeName = "monitoredAreasMap";
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return new StoreConnector<AppState, _ViewModel>(
|
|
distinct: true,
|
|
converter: (store) {
|
|
return new _ViewModel(store.state.monitoredAreas);
|
|
},
|
|
builder: (context, view) {
|
|
return new Scaffold(
|
|
appBar:
|
|
new AppBar(title: new Text(S.of(context).monitoredAreasTitle)),
|
|
drawer: new MainDrawer(context, MonitoredAreasPage.routeName),
|
|
bottomNavigationBar: new CustomBottomAppBar(
|
|
fabLocation: FloatingActionButtonLocation.centerDocked,
|
|
showNotch: true,
|
|
color: fires100,
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
actions: <Widget>[
|
|
new Flexible(
|
|
child: new Padding(
|
|
padding: new EdgeInsets.only(left: 10.0, right: 10.0),
|
|
child: new Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
crossAxisAlignment: CrossAxisAlignment.center,
|
|
children: [
|
|
new Text(S.of(context).mapPrivacy,
|
|
style: new TextStyle(
|
|
fontStyle: FontStyle.italic,
|
|
color: Colors.black38))
|
|
])))
|
|
]),
|
|
body: !(view.monitoredAreas is List)
|
|
? new FiresSpinner()
|
|
: new Padding(
|
|
padding: new EdgeInsets.all(10.0),
|
|
child: new Column(
|
|
children: [
|
|
new Padding(
|
|
padding: new EdgeInsets.only(
|
|
top: 8.0, bottom: 8.0, left: 0.0, right: 0.0),
|
|
child: new Text(S.of(context).inGreenMonitoredAreas),
|
|
),
|
|
new Flexible(
|
|
child: new FlutterMap(
|
|
options: new MapOptions(
|
|
initialCenter: new LatLng(53.5775, 3.106111),
|
|
initialZoom: 1.0,
|
|
),
|
|
children: [
|
|
new TileLayer(
|
|
urlTemplate:
|
|
"https://tile.openstreetmap.org/{z}/{x}/{y}.png",
|
|
userAgentPackageName:
|
|
'com.example.fires_flutter'),
|
|
new PolylineLayer(
|
|
polylines: view.monitoredAreas,
|
|
)
|
|
],
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
);
|
|
});
|
|
}
|
|
}
|