map: provide user-agent header for OSM/Stamer
This commit is contained in:
parent
fcca4776c6
commit
727635ef68
3 changed files with 28 additions and 0 deletions
|
@ -171,6 +171,7 @@ class StorageAccessStreamHandler(private val activity: Activity, arguments: Any?
|
||||||
})
|
})
|
||||||
activity.startActivityForResult(intent, MainActivity.SELECT_DIRECTORY_REQUEST)
|
activity.startActivityForResult(intent, MainActivity.SELECT_DIRECTORY_REQUEST)
|
||||||
} else {
|
} else {
|
||||||
|
// TODO TLAD support KitKat
|
||||||
success(null)
|
success(null)
|
||||||
endOfStream()
|
endOfStream()
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import 'dart:async';
|
||||||
import 'dart:ui';
|
import 'dart:ui';
|
||||||
|
|
||||||
import 'package:aves/app_flavor.dart';
|
import 'package:aves/app_flavor.dart';
|
||||||
|
@ -27,12 +28,15 @@ import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
import 'package:overlay_support/overlay_support.dart';
|
import 'package:overlay_support/overlay_support.dart';
|
||||||
|
import 'package:package_info_plus/package_info_plus.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:tuple/tuple.dart';
|
import 'package:tuple/tuple.dart';
|
||||||
|
|
||||||
class AvesApp extends StatefulWidget {
|
class AvesApp extends StatefulWidget {
|
||||||
final AppFlavor flavor;
|
final AppFlavor flavor;
|
||||||
|
|
||||||
|
static String userAgent = '';
|
||||||
|
|
||||||
const AvesApp({
|
const AvesApp({
|
||||||
Key? key,
|
Key? key,
|
||||||
required this.flavor,
|
required this.flavor,
|
||||||
|
@ -161,6 +165,7 @@ class _AvesAppState extends State<AvesApp> {
|
||||||
isRotationLocked: await windowService.isRotationLocked(),
|
isRotationLocked: await windowService.isRotationLocked(),
|
||||||
areAnimationsRemoved: await AccessibilityService.areAnimationsRemoved(),
|
areAnimationsRemoved: await AccessibilityService.areAnimationsRemoved(),
|
||||||
);
|
);
|
||||||
|
unawaited(_initUserAgent());
|
||||||
FijkLog.setLevel(FijkLogLevel.Warn);
|
FijkLog.setLevel(FijkLogLevel.Warn);
|
||||||
|
|
||||||
// keep screen on
|
// keep screen on
|
||||||
|
@ -205,6 +210,11 @@ class _AvesAppState extends State<AvesApp> {
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<void> _initUserAgent() async {
|
||||||
|
final info = await PackageInfo.fromPlatform();
|
||||||
|
AvesApp.userAgent = '${info.packageName}/${info.version}';
|
||||||
|
}
|
||||||
|
|
||||||
void _onNewIntent(Map? intentData) {
|
void _onNewIntent(Map? intentData) {
|
||||||
debugPrint('$runtimeType onNewIntent with intentData=$intentData');
|
debugPrint('$runtimeType onNewIntent with intentData=$intentData');
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import 'package:aves/widgets/aves_app.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_map/flutter_map.dart';
|
import 'package:flutter_map/flutter_map.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
@ -11,6 +12,7 @@ class OSMHotLayer extends StatelessWidget {
|
||||||
options: TileLayerOptions(
|
options: TileLayerOptions(
|
||||||
urlTemplate: 'https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png',
|
urlTemplate: 'https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png',
|
||||||
subdomains: ['a', 'b', 'c'],
|
subdomains: ['a', 'b', 'c'],
|
||||||
|
tileProvider: _NetworkTileProvider(),
|
||||||
retinaMode: context.select<MediaQueryData, double>((mq) => mq.devicePixelRatio) > 1,
|
retinaMode: context.select<MediaQueryData, double>((mq) => mq.devicePixelRatio) > 1,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
@ -26,6 +28,7 @@ class StamenTonerLayer extends StatelessWidget {
|
||||||
options: TileLayerOptions(
|
options: TileLayerOptions(
|
||||||
urlTemplate: 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner-lite/{z}/{x}/{y}{r}.png',
|
urlTemplate: 'https://stamen-tiles-{s}.a.ssl.fastly.net/toner-lite/{z}/{x}/{y}{r}.png',
|
||||||
subdomains: ['a', 'b', 'c', 'd'],
|
subdomains: ['a', 'b', 'c', 'd'],
|
||||||
|
tileProvider: _NetworkTileProvider(),
|
||||||
retinaMode: context.select<MediaQueryData, double>((mq) => mq.devicePixelRatio) > 1,
|
retinaMode: context.select<MediaQueryData, double>((mq) => mq.devicePixelRatio) > 1,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
@ -41,8 +44,22 @@ class StamenWatercolorLayer extends StatelessWidget {
|
||||||
options: TileLayerOptions(
|
options: TileLayerOptions(
|
||||||
urlTemplate: 'https://stamen-tiles-{s}.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.jpg',
|
urlTemplate: 'https://stamen-tiles-{s}.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.jpg',
|
||||||
subdomains: ['a', 'b', 'c', 'd'],
|
subdomains: ['a', 'b', 'c', 'd'],
|
||||||
|
tileProvider: _NetworkTileProvider(),
|
||||||
retinaMode: context.select<MediaQueryData, double>((mq) => mq.devicePixelRatio) > 1,
|
retinaMode: context.select<MediaQueryData, double>((mq) => mq.devicePixelRatio) > 1,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class _NetworkTileProvider extends NetworkTileProvider {
|
||||||
|
final Map<String, String> headers = {
|
||||||
|
'User-Agent': AvesApp.userAgent,
|
||||||
|
};
|
||||||
|
|
||||||
|
_NetworkTileProvider();
|
||||||
|
|
||||||
|
@override
|
||||||
|
ImageProvider getImage(Coords<num> coords, TileLayerOptions options) {
|
||||||
|
return NetworkImage(getTileUrl(coords, options), headers: headers);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue