Fix opentopomap x/y, allow searching in release when not offline

This commit is contained in:
stopflock
2025-10-05 16:48:25 -05:00
parent 731cdc4a4b
commit 111bdc4254
6 changed files with 93 additions and 39 deletions

View File

@@ -79,8 +79,6 @@ cp lib/keys.dart.example lib/keys.dart
## Roadmap
### Needed Bugfixes
- No seach or navigation while offline (the thing we do now)
- Let user search in release builds, just not navigate
- Swap in tsbichof avoidance routing API
### Current Development

View File

@@ -43,6 +43,24 @@ const bool kEnableDevelopmentModes = false; // Set to false to hide sandbox/simu
// Navigation features - set to false to hide navigation UI elements while in development
const bool kEnableNavigationFeatures = kEnableDevelopmentModes; // Hide navigation until fully implemented
/// Search availability: dev builds always, release builds only when online
bool enableSearchFeatures({required bool offlineMode}) {
if (kEnableDevelopmentModes) {
return true; // Dev builds: always allow search
} else {
return !offlineMode; // Release builds: only when online
}
}
/// Navigation availability: only dev builds, and only when online
bool enableNavigationFeatures({required bool offlineMode}) {
if (!kEnableDevelopmentModes) {
return false; // Release builds: never allow navigation
} else {
return !offlineMode; // Dev builds: only when online
}
}
// Marker/node interaction
const int kCameraMinZoomLevel = 10; // Minimum zoom to show nodes (Overpass)
const int kOsmApiMinZoomLevel = 13; // Minimum zoom for OSM API bbox queries (sandbox mode)

View File

@@ -186,7 +186,7 @@ class DefaultTileProviders {
TileType(
id: 'opentopomap_topo',
name: 'Topographic',
urlTemplate: 'https://tile.memomaps.de/tilegen/{z}/{y}/{x}.png',
urlTemplate: 'https://tile.memomaps.de/tilegen/{z}/{x}/{y}.png',
attribution: 'Kartendaten: © OpenStreetMap-Mitwirkende, SRTM | Kartendarstellung: © OpenTopoMap (CC-BY-SA)',
maxZoom: 18,
),

View File

@@ -522,15 +522,15 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
sheetHeight: activeSheetHeight,
selectedNodeId: _selectedNodeId,
onNodeTap: openNodeTagSheet,
onSearchPressed: kEnableNavigationFeatures ? _onNavigationButtonPressed : null,
onSearchPressed: (enableSearchFeatures(offlineMode: appState.offlineMode) || enableNavigationFeatures(offlineMode: appState.offlineMode)) ? _onNavigationButtonPressed : null,
onUserGesture: () {
if (appState.followMeMode != FollowMeMode.off) {
appState.setFollowMeMode(FollowMeMode.off);
}
},
),
// Search bar (slides in when in search mode) - only in dev mode
if (kEnableNavigationFeatures && appState.isInSearchMode)
// Search bar (slides in when in search mode) - available based on feature flags
if (enableSearchFeatures(offlineMode: appState.offlineMode) && appState.isInSearchMode)
Positioned(
top: 0,
left: 0,

View File

@@ -148,18 +148,52 @@ class MapOverlays extends StatelessWidget {
builder: (context, appState, child) {
return Column(
children: [
// Navigation button - simplified logic (only show in dev mode)
if (kEnableNavigationFeatures && onSearchPressed != null && (appState.showSearchButton || appState.showRouteButton)) ...[
FloatingActionButton(
mini: true,
heroTag: "search_nav",
onPressed: onSearchPressed,
tooltip: appState.showRouteButton
? LocalizationService.instance.t('navigation.routeOverview')
: LocalizationService.instance.t('navigation.searchLocation'),
child: Icon(appState.showRouteButton ? Icons.route : Icons.search),
),
const SizedBox(height: 8),
// Search/Navigation button - show based on new feature flags
if (onSearchPressed != null) ...[
// Show search button if search is available OR if showing route button
if ((enableSearchFeatures(offlineMode: appState.offlineMode) && appState.showSearchButton) ||
(enableNavigationFeatures(offlineMode: appState.offlineMode) && appState.showRouteButton)) ...[
FloatingActionButton(
mini: true,
heroTag: "search_nav",
onPressed: () {
// If offline and trying to search, show snackbar
if (appState.showSearchButton && appState.offlineMode && !kEnableDevelopmentModes) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Search not available offline'),
duration: Duration(seconds: 2),
),
);
} else {
onSearchPressed?.call();
}
},
tooltip: appState.showRouteButton
? LocalizationService.instance.t('navigation.routeOverview')
: LocalizationService.instance.t('navigation.searchLocation'),
child: Icon(appState.showRouteButton ? Icons.route : Icons.search),
),
const SizedBox(height: 8),
]
// Show disabled search button with snackbar in release builds when offline
else if (appState.showSearchButton && !kEnableDevelopmentModes) ...[
FloatingActionButton(
mini: true,
heroTag: "search_nav",
onPressed: () {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Search not available offline'),
duration: Duration(seconds: 2),
),
);
},
tooltip: LocalizationService.instance.t('navigation.searchLocation'),
child: Icon(Icons.search),
),
const SizedBox(height: 8),
],
],
// Layer selector button

View File

@@ -4,6 +4,7 @@ import 'package:provider/provider.dart';
import 'package:latlong2/latlong.dart';
import '../app_state.dart';
import '../dev_config.dart';
import '../services/localization_service.dart';
class NavigationSheet extends StatelessWidget {
@@ -100,29 +101,32 @@ class NavigationSheet extends StatelessWidget {
address: provisionalAddress,
),
const SizedBox(height: 16),
Row(
children: [
Expanded(
child: ElevatedButton.icon(
icon: const Icon(Icons.directions),
label: Text(LocalizationService.instance.t('navigation.routeTo')),
onPressed: () {
appState.startRoutePlanning(thisLocationIsStart: false);
},
// Only show routing buttons if navigation features are enabled
if (enableNavigationFeatures(offlineMode: appState.offlineMode)) ...[
Row(
children: [
Expanded(
child: ElevatedButton.icon(
icon: const Icon(Icons.directions),
label: Text(LocalizationService.instance.t('navigation.routeTo')),
onPressed: () {
appState.startRoutePlanning(thisLocationIsStart: false);
},
),
),
),
const SizedBox(width: 12),
Expanded(
child: ElevatedButton.icon(
icon: const Icon(Icons.my_location),
label: Text(LocalizationService.instance.t('navigation.routeFrom')),
onPressed: () {
appState.startRoutePlanning(thisLocationIsStart: true);
},
const SizedBox(width: 12),
Expanded(
child: ElevatedButton.icon(
icon: const Icon(Icons.my_location),
label: Text(LocalizationService.instance.t('navigation.routeFrom')),
onPressed: () {
appState.startRoutePlanning(thisLocationIsStart: true);
},
),
),
),
],
),
],
),
],
],
// SETTING SECOND POINT: Show both points and select button