diff --git a/.gitignore b/.gitignore
index 3a83c2f..fd6fc56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,30 @@
-# See https://www.dartlang.org/guides/libraries/private-files
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
-# Files and directories created by pub
-.dart_tool/
-.packages
-build/
-# If you're building an application, you may want to check-in your pubspec.lock
-pubspec.lock
-
-# Directory created by dartdoc
-# If you don't generate documentation locally you can remove this line.
-doc/api/
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
-# dotenv environment variables file
-.env*
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
-# Avoid committing generated Javascript files:
-*.dart.js
-*.info.json # Produced by the --dump-info flag.
-*.js # When generated by dart2js. Don't specify *.js if your
- # project includes source files written in JavaScript.
-*.js_
-*.js.deps
-*.js.map
-
-.flutter-plugins
-.flutter-plugins-dependencies
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+**/pubspec.lock <- breaks release pipeline for some reason
+**/doc/api/
+.dart_tool/
+.packages
+build/
\ No newline at end of file
diff --git a/.pubignore b/.pubignore
new file mode 100644
index 0000000..92dbd8e
--- /dev/null
+++ b/.pubignore
@@ -0,0 +1,31 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+**/pubspec.lock
+**/doc/api/
+.dart_tool/
+.packages
+build/
+example/
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index 328b15e..0000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- // Use IntelliSense to learn about possible attributes.
- // Hover to view descriptions of existing attributes.
- // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
- "version": "0.2.0",
- "configurations": [
- {
- "name": "example",
- "cwd": "mapsindoors/example",
- "request": "launch",
- "type": "dart"
- },
- {
- "name": "example (profile mode)",
- "cwd": "mapsindoors/example",
- "request": "launch",
- "type": "dart",
- "flutterMode": "profile"
- },
- {
- "name": "example (release mode)",
- "cwd": "mapsindoors/example",
- "request": "launch",
- "type": "dart",
- "flutterMode": "release"
- }
- ]
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..a0ddf13
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,25 @@
+# Changelog
+
+## 2.1.0
+
+* Updated Mapsindoors SDKs
+ * Android to 4.2.10
+ * iOS to 4.2.13
+* Added `showRouteLegButtons` to `MPDirectionsRenderer`
+* Added `setLabelOptions` to `MapsindoorsWidget`
+
+## 2.0.1
+
+* RETRACTED
+
+## 2.0.0
+
+* Moved from mapsindoors to allow for multiple map providers
+* Changes to classes:
+ * MapControl
+ * MapControl has merged with the MapsIndoorsWidget, combining them into a single entity. the Widget will still be built in the build tree, and accepts a listener as a parameter to wait for the MapControl part to be initialized.
+* MapsIndoors
+ * Has been split up into functions on the namespace to align better with dart language standards. Some methods have changed naming to avoid collision with popular method and parameter naming (eg. MapsIndoors.load() is now loadMapsIndoors())
+* Changes to the Widget
+ * The MapsIndoorsWidget has been changed to be a UniqueWidget, this is to ensure that the underlying MapsIndoors in the platform code can function normally.
+
\ No newline at end of file
diff --git a/README.md b/README.md
index 57109ca..900a227 100644
--- a/README.md
+++ b/README.md
@@ -9,60 +9,46 @@ A federated Flutter plugin for integrating with the native MapsIndoors SDK.
## Features
-
Use this plugin to:
-
- Show indoor mapping and navigation.
- Perform real-time wayfinding.
- See location live updates.
-
-This plugin is based on the MapsIndoors V4 SDK for Android and iOS. At the moment only Google Maps is supported.
+
+This plugin is based on the MapsIndoors-Mapbox V4 SDK for Android and iOS.
## Getting Started
-
-Add MapsIndoors version `1.0.0` to your `pubspec.yaml`.
-
+Add MapsIndoors to your `pubspec.yaml`.
```yaml
-mapsindoors: ^1.0.0
+mapsindoors_mapbox: ^2.0.1
```
### Android
-
+#### Setup
-#### Android Gooogle Maps Setup
-
-
-To get the underlying Google Map to function, you need to perform the following steps:
-
+To get the underlying Mapbox map to function, you need to perform the following steps:
1. Navigate to `android/app/src/main/res/value`.
-2. Create a file in this folder called `google_maps_api_key.xml`.
-3. Copy and paste the below code snippet and replace `YOUR_KEY_HERE` with your Google Maps API key.
-
-
+2. Create a file in this folder called `mapbox_api_key.xml`.
+3. Copy and paste the below code snippet and replace `YOUR_KEY_HERE` with your Mapbox API key.
```xml
- YOUR_KEY_HERE
+ YOUR_KEY_HERE
+ YOUR_KEY_HERE
```
-
-
#### MapsIndoors Gradle Setup
-
-The plugin Gradle project has trouble resolving the MapsIndoors dependency, so to ensure that it is resolved correctly, do the following:
-
+To ensure the plugin is able to resolve its MapsIndoors Gradle dependency, do the following:
1. Navigate to the app's project level `build.gradle`.
-2. add `maven { url 'https://maven.mapsindoors.com/' }` to `allprojects`/`repositories` after `mavenCentral()`
-
+2. add `maven { url 'https://maven.mapsindoors.com/' }` to `allprojects`/`repositories` after `mavenCentral()
```groovy
allprojects {
@@ -74,73 +60,95 @@ allprojects {
}
```
-
-
### iOS
-#### iOS Gooogle Maps Setup
+The MapsIndoors SDK requires iOS 13, so make sure that your podfile is configured for iOS 13. Add use_frameworks! inside your app target as well.
-
-To get the underlying Google Map to function, you need to perform the following steps:
+```
+platform :ios, '13.0
+
+target 'MyApp' do
+ use_frameworks!
+
+post_install do |installer|
+ installer.pods_project.targets.each do |target|
+ target.build_configurations.each do |config|
+ config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES'
+ end
+ ...
+end
+...
+```
#### Providing API key
-##### Swift
-
-1. Navigate to `iOS/Runner/AppDelegate.swift`.
-2. Import GoogleMaps on the class
-3. Add this code as the first line inside the application function: `GMSServices.provideAPIKey("YOUR GOOGLE MAPS API KEY HERE")`
-
-##### Objective-C
-
-1. Navigate to `iOS/Runner/AppDelegate.h`.
-2. Import `#import "GoogleMaps/GoogleMaps.h"` on the class.
-3. Add this code as the first line inside the application function: `[GMSServices provideAPIKey:@"YOUR GOOGLE MAPS API KEY HERE"];`
-
-#### Adding MapsIndoors script specific to Google Maps, to Podfile
-
-After this you should navigate into the iOS folder of your flutter project and add this script to the applications Podfile: [MapsIndoors podfile Post install](https://github.com/MapsIndoors/MapsIndoorsIOS/wiki/Podfile-post_install-v4)
+Navigate to your application settings and add your Mapbox public access token to info with the key MBXAccessToken
+Setup your secret access token for downloading the sdk. Read how to do this here: [Configure credentials](https://docs.mapbox.com/ios/maps/guides/install/#configure-credentials)
## Usage
-
This section has examples of code for the following tasks:
-
- [Showing your Map](#showing-your-map)
- [Showing a Route](#showing-a-route)
- [Searching Locations](#searching-locations)
- [Changing the look with DisplayRules](#changing-the-look-with-displayrules)
-
### Showing your Map
-
This snippet shows how to set up `MapsIndoors` in a Flutter application. First, the `MapsIndoorsWidget` is added to the application's build tree.
-
-Optionally we can add a `MPFloorSelector` to the map, here we use `MPDefaultFloorSelector` as it is provided with the MapsIndoors package. The selector must be added both to the build tree as well as to `MapControl` in order to function correctly.
-
+
+Optionally we can add a `MPFloorSelector` to the map. Here we use `MPDefaultFloorSelector` as it is provided with the MapsIndoors package. The selector must be added both to the build tree as well as to `MapControl` in order to function correctly.
+
Once `initState()` has been called, `MapsIndoors` begins initialization, and once that is done successfully, `MapControl` begins initialization.
-
-Once `MapControl` is initialize we can invoke the `goTo` method to move the camera to the default venue.
-
+
+Once `MapControl` is initialized we can invoke the `goTo` method to move the camera to the default venue.
```Dart
+import 'package:mapsindoors/mapsindoors.dart' as MapsIndoors;
+import 'package:mapsindoors/mapsindoors_library.dart';
+
+void main() {
+ runApp(const MyApp());
+}
+
+class MyApp extends StatelessWidget {
+ const MyApp({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ return const MaterialApp(
+ // replace the string with your own api key
+ home: MapWidget("demo"),
+ );
+ }
+}
+
+class MapWidget extends StatefulWidget {
+ final String apiKey;
+
+ const MapWidget({Key? key, required this.apiKey}) : super(key: key);
+
+ @override
+ MapWidgetState createState() => MapWidgetState();
+}
+
class MapWidgetState extends State {
- // Lets build a floor selector widget here, we need to add this to MapControl later.
+ // Let's build a floor selector widget here, we need to add this to MapControl later.
final _floorSelectorWidget = MPDefaultFloorSelector();
// MapControl will be initialized after MapsIndoors.
- late final MapControl _mapControl;
+ late final MapsIndoorsWidget _mapController;
@override
Widget build(BuildContext context) {
return Scaffold(
body: Container(
// Add the MapsIndoors Widget to your Widget, it will automatically fill the container it is placed in.
- child: MapsIndoorsWidget(
+ child: _mapController = MapsIndoorsWidget(
// build with the default floor selector, this is optional.
floorSelector: _floorSelectorWidget,
+ readyListener: _mapControlReadyListener,
),
),
);
@@ -149,39 +157,30 @@ class MapWidgetState extends State {
@override
void initState() {
super.initState();
- // Start initializing mapsindoors, replace the string with your own api key.
- _mapsIndoorsReadyListener(MapsIndoors.load("your_mapsindoors_api_key"));
+ // Start initializing mapsindoors.
+ loadMapsIndoors(widget.apiKey);
}
- void _mapsIndoorsReadyListener(Future error) async {
- if ((await error) == null) {
- // if no errors occured during MapsIndoors load, then we can initialize MapControl
- // we use setFloorSelector to allow MapControl to fill out the floor selector widget with floor information
- MapControl.create(MPMapConfig().setFloorSelector(_floorSelectorWidget)).then((mc) async {
- _mapControl = mc;
- // After initialization, lets show some indoor maps, here we move the camera to the default venue.
- _mapControl.goTo(await MapsIndoors.getDefaultVenue());
- }).catchError((err) {
- print("Creating mapcontrol faced an issue: $err");
- });
+ void _mapControlReadyListener(MPError? error) async {
+ if (error == null) {
+ // if no errors occured during MapControl load, then we can start using the map
+ // Here we move the camera to the default venue.
+ _mapController.goTo(await getDefaultVenue());
+
} else {
- print("MapsIndoors faced an error: $error");
+ print("Creating mapcontrol faced an issue: $err");
}
}
}
```
-
-
### Showing a Route
-
-This code snippet initializes the `MPDirectionsService` and `MPDirectionsRenderer` classes, and uses `_mapControl` which have been initialized elsewhere.
-
+This code snippet initializes the `MPDirectionsService` and `MPDirectionsRenderer` classes, and uses `_mapControl` which has been initialized elsewhere.
+
The `showRouteToLocation` function is used to query a route from the user's current position to a specified location using `directionsService.getRoute()`.
-
+
If successful, the route is displayed on the map using `directionsRenderer.setRoute(route)`.
-
```Dart
// We assume MapControl has already been initialized
@@ -203,69 +202,61 @@ void showRouteToLocation(MPLocation location) async {
}
```
-
-
### Searching Locations
-
This code snippet shows a function called `searchForParking` that takes a single argument of type `MPPoint`. The function uses `MapsIndoors` to search for locations matching the query string `"parking"` near the point specified.
-
+
It mathces in the locations' descriptions, names, and external IDs to the query string. Once the search is complete, it is possible to update/get information from the locations (not specified in the code snippet).
-
```Dart
/// This method searches for locations
void searchForParking(MPPoint point) {
- final mpq = MPQueryBuilder();
+ final mpq = MPQuery.builder()
// Set the search string
- mpq.setQuery("parking");
+ ..setQuery("parking")
// Set the point where we would like to search around
- mpq.setNear(point);
+ ..setNear(point)
// We are searcing in the locations description, name and external id.
- mpq.setQueryProperties([MPLocationPropertyNames.description.name, MPLocationPropertyNames.name.name, MPLocationPropertyNames.externalId.name]);
+ ..setQueryProperties([MPLocationPropertyNames.description.name, MPLocationPropertyNames.name.name, MPLocationPropertyNames.externalId.name]);
// Apply the query on MapsIndoors.
- MapsIndoors.getLocationsByQuery(query: mpq.build()).then((locations) {
+ getLocationsByQuery(query: mpq.build()).then((locations) {
print("number of paring near the point: ${locations?.length}");
// do something with the locations
});
}
```
-
-
### Changing the look with DisplayRules
-
This code snippet shows three ways to manipulate display rules in the MapsIndoors SDK.
-
+
The `hideLocationsByDefault()` method hides all markers that are not explicitly visible by setting the main display rule to not visible.
-
+
The `showLocationsByDefault()` method ensures all markers are shown by setting the main display rule to visible.
-
+
The `changeTypePolygonColor(String type, String color)` method changes the fill color for all polygons belonging to a specific type. It gets the display rule for the specified type using `getDisplayRuleByName`, and sets the fill color using `setPolygonFillColor`.
-
+
These methods can all be used to customize the display of markers and polygons on the map.
-
```Dart
/// This method changes the main display rule to hide all markers,
/// This will cause all locations that are not explicitly visible to be hidden.
void hideLocationsByDefault() async {
- final MPDisplayRule? main = await MapsIndoors.getMainDisplayRule();
+ final MPDisplayRule? main = await getMainDisplayRule();
main?.setVisible(false);
}
/// This method changes the main display rule to show all markers,
/// This will cause all locations that are not explicitly visible to be shown.
void showLocationsByDefault() async {
- final MPDisplayRule? main = await MapsIndoors.getMainDisplayRule();
+ final MPDisplayRule? main = await getMainDisplayRule();
main?.setVisible(true);
}
/// This method changes the fill color for all polygons belonging to a specific [type]
/// the [color] MUST be a valid hex color string.
void changeTypePolygonColor(String type, String color) async {
- final MPDisplayRule? rule = await MapsIndoors.getDisplayRuleByName(type);
+ final MPDisplayRule? rule = await getDisplayRuleByName(type);
rule?.setPolygonFillColor(color);
}
-```
+```
\ No newline at end of file
diff --git a/mapsindoors_mapbox/dartdoc_options.yaml b/dartdoc_options.yaml
similarity index 100%
rename from mapsindoors_mapbox/dartdoc_options.yaml
rename to dartdoc_options.yaml
diff --git a/mapsindoors_mapbox/lib/core/mapsindoors.dart b/lib/core/mapsindoors.dart
similarity index 57%
rename from mapsindoors_mapbox/lib/core/mapsindoors.dart
rename to lib/core/mapsindoors.dart
index e6ccafd..095cc14 100644
--- a/mapsindoors_mapbox/lib/core/mapsindoors.dart
+++ b/lib/core/mapsindoors.dart
@@ -1,30 +1,37 @@
part of mapsindoors;
/// gets the platform name and build version
-Future getPlatformVersion() => UtilPlatform.instance.getPlatformVersion();
+Future getPlatformVersion() =>
+ UtilPlatform.instance.getPlatformVersion();
/// Loads content from the MapsIndoors solution matching the given API [key].
///
/// Use the [MPError] to determine if the SDK has loaded successfully.
-Future loadMapsIndoors(String key) => MapsindoorsPlatform.instance.load(key);
+Future loadMapsIndoors(String key) =>
+ MapsindoorsPlatform.instance.load(key);
/// Retrieve the default display rule (hardcoded display rule in the SDK).
///
/// Requires that [loadMapsIndoors] has successfully executed.
-Future getDefaultDisplayRule() => Future.value(MapsindoorsPlatform.instance.createDisplayRuleWithName("default"));
+Future getDefaultDisplayRule() => Future.value(
+ MapsindoorsPlatform.instance.createDisplayRuleWithName("default"));
/// Retrieve the main display rule (can be configured in the CMS).
///
/// Requires that [loadMapsIndoors] has successfully executed.
-Future getMainDisplayRule() => Future.value(MapsindoorsPlatform.instance.createDisplayRuleWithName("main"));
+Future getMainDisplayRule() => Future.value(
+ MapsindoorsPlatform.instance.createDisplayRuleWithName("main"));
/// Retrieve the display rule for the given [location]
///
/// Requires that [loadMapsIndoors] has successfully executed.
-Future getDisplayRuleByLocation(FutureOr location) async {
- final exists = await MapsindoorsPlatform.instance.locationDisplayRuleExists((await location).id);
+Future getDisplayRuleByLocation(
+ FutureOr location) async {
+ final exists = await MapsindoorsPlatform.instance
+ .locationDisplayRuleExists((await location).id);
if (exists == true) {
- return MapsindoorsPlatform.instance.createDisplayRuleWithName((await location).id.value);
+ return MapsindoorsPlatform.instance
+ .createDisplayRuleWithName((await location).id.value);
} else {
return null;
}
@@ -45,19 +52,25 @@ Future getDisplayRuleByName(String name) async {
/// Retrieve the corresponding display rule for the given [MPSolutionDisplayRuleEnum].
///
/// Requires that [loadMapsIndoors] has successfully executed.
-Future getSolutionDisplayRule(MPSolutionDisplayRuleEnum solutionDisplayRule) => Future.value(MapsindoorsPlatform.instance.createDisplayRuleWithName(solutionDisplayRule.name));
+Future getSolutionDisplayRule(
+ MPSolutionDisplayRuleEnum solutionDisplayRule) =>
+ Future.value(MapsindoorsPlatform.instance
+ .createDisplayRuleWithName(solutionDisplayRule.name));
/// Add a one time [listener] to be invoked when MapsIndoors is ready
-void addOnMapsIndoorsReadyListener(OnMapsIndoorsReadyListener listener) => MapsindoorsPlatform.instance.addOnMapsIndoorsReadyListener(listener);
+void addOnMapsIndoorsReadyListener(OnMapsIndoorsReadyListener listener) =>
+ MapsindoorsPlatform.instance.addOnMapsIndoorsReadyListener(listener);
/// Remove a MapsIndoors ready listener
-void removeOnMapsIndoorsReadyListener(OnMapsIndoorsReadyListener listener) => MapsindoorsPlatform.instance.removeOnMapsIndoorsReadyListener(listener);
+void removeOnMapsIndoorsReadyListener(OnMapsIndoorsReadyListener listener) =>
+ MapsindoorsPlatform.instance.removeOnMapsIndoorsReadyListener(listener);
/// Checks if there is on device data (embedded/locally stored) available. For this to return true,
/// data has to be available for all solution data types ([MPLocation], [MPBuilding]...)
///
/// Returns true if data is available, otherwise returns false
-Future checkOfflineDataAvailability() => MapsindoorsPlatform.instance.checkOfflineDataAvailability();
+Future checkOfflineDataAvailability() =>
+ MapsindoorsPlatform.instance.checkOfflineDataAvailability();
/// Clears the internal state of MapsIndoors SDK. Any loaded content is purged from memory.
///
@@ -67,7 +80,8 @@ void destroyMapsIndoors() => MapsindoorsPlatform.instance.destroy();
/// [disable] SDK event logging through MapsIndoors. No logs will be created or send with this disabled.
///
/// By default it is enabled. But disabled in the CMS meaning logs will be created but never uploaded.
-Future disableMapsIndoorsEventLogging(bool disable) => MapsindoorsPlatform.instance.disableEventLogging(disable);
+Future disableMapsIndoorsEventLogging(bool disable) =>
+ MapsindoorsPlatform.instance.disableEventLogging(disable);
/// Retrieves the API key that was set by using [loadMapsIndoors]
///
@@ -75,54 +89,69 @@ Future disableMapsIndoorsEventLogging(bool disable) => MapsindoorsPlatform
Future getAPIKey() => MapsindoorsPlatform.instance.getAPIKey();
/// Returns a list of the current solution's available languages
-Future?> getMapsIndoorsAvailableLanguages() => MapsindoorsPlatform.instance.getAvailableLanguages();
+Future?> getMapsIndoorsAvailableLanguages() =>
+ MapsindoorsPlatform.instance.getAvailableLanguages();
/// Gets a collection of all buildings for the current API key
-Future getBuildings() => MapsindoorsPlatform.instance.getBuildings();
+Future getBuildings() =>
+ MapsindoorsPlatform.instance.getBuildings();
/// Gets a collection of all categories for the current API key
-Future getCategories() => MapsindoorsPlatform.instance.getCategories();
+Future getCategories() =>
+ MapsindoorsPlatform.instance.getCategories();
/// Returns the current solution's default language
-Future getMapsIndoorsDefaultLanguage() => MapsindoorsPlatform.instance.getDefaultLanguage();
+Future getMapsIndoorsDefaultLanguage() =>
+ MapsindoorsPlatform.instance.getDefaultLanguage();
/// Gets the current SDK language
-Future getMapsIndoorsLanguage() => MapsindoorsPlatform.instance.getLanguage();
+Future getMapsIndoorsLanguage() =>
+ MapsindoorsPlatform.instance.getLanguage();
/// Retrieves a [MPLocation] by its [id]
-Future getLocationById(String id) => MapsindoorsPlatform.instance.getLocationById(id);
+Future getLocationById(String id) =>
+ MapsindoorsPlatform.instance.getLocationById(id);
/// Gets all locations (a list of [MPLocation] objects) for the current API Key
-Future?> getLocations() => MapsindoorsPlatform.instance.getLocations();
+Future?> getLocations() =>
+ MapsindoorsPlatform.instance.getLocations();
/// Runs a query on all the available [MPLocation]s with an optional [MPQuery] and/or [MPFilter]
-Future?> getLocationsByQuery({MPQuery? query, MPFilter? filter}) => MapsindoorsPlatform.instance.getLocationsByQuery(query, filter);
+Future?> getLocationsByQuery(
+ {MPQuery? query, MPFilter? filter}) =>
+ MapsindoorsPlatform.instance.getLocationsByQuery(query, filter);
/// Retrieves a list of [MPLocation]s by external [ids]
-Future?> getLocationsByExternalIds(List ids) => MapsindoorsPlatform.instance.getLocationsByExternalIds(ids);
+Future?> getLocationsByExternalIds(List ids) =>
+ MapsindoorsPlatform.instance.getLocationsByExternalIds(ids);
/// Gets a list of available map styles
-Future?> getMapStyles() => MapsindoorsPlatform.instance.getMapStyles();
+Future?> getMapStyles() =>
+ MapsindoorsPlatform.instance.getMapStyles();
/// Returns the current position provider, if any is set
-MPPositionProviderInterface? getPositionProvider() => MapsindoorsPlatform.instance.getPositionProvider();
+MPPositionProviderInterface? getPositionProvider() =>
+ MapsindoorsPlatform.instance.getPositionProvider();
/// Set a new position provider, or pass null to remove the current one
///
/// Positioning starts as soon as the provider is set and has produced a position
-void setPositionProvider(MPPositionProviderInterface? provider) => MapsindoorsPlatform.instance.setPositionProvider(provider);
+void setPositionProvider(MPPositionProviderInterface? provider) =>
+ MapsindoorsPlatform.instance.setPositionProvider(provider);
/// Gets the [MPSolution] for the current API key
Future getSolution() => MapsindoorsPlatform.instance.getSolution();
/// Gets a collection of all venues for the current API key
-Future getVenues() => MapsindoorsPlatform.instance.getVenues();
+Future getVenues() =>
+ MapsindoorsPlatform.instance.getVenues();
/// Check if the current API key is valid
Future isAPIKeyValid() => MapsindoorsPlatform.instance.isAPIKeyValid();
/// Check if [loadMapsIndoors] has been called
-Future isMapsIndoorsInitialized() => MapsindoorsPlatform.instance.isInitialized();
+Future isMapsIndoorsInitialized() =>
+ MapsindoorsPlatform.instance.isInitialized();
/// Check if the SDK is initialized and ready for use
Future isMapsIndoorsReady() => MapsindoorsPlatform.instance.isReady();
@@ -134,27 +163,34 @@ Future isMapsIndoorsReady() => MapsindoorsPlatform.instance.isReady();
/// the solution's default language ([MPSolution.defaultLanguage])
/// the current device language, if the MapsIndoors data isn't available (ie: first app run without network access)
///
-Future setMapsIndoorsLanguage(String language) => MapsindoorsPlatform.instance.setLanguage(language);
+Future setMapsIndoorsLanguage(String language) =>
+ MapsindoorsPlatform.instance.setLanguage(language);
/// Main data synchronization method
///
/// If not manually invoked, [MapsIndoorsWidget] will invoke it when built
-Future synchronizeMapsIndoorsContent() => MapsindoorsPlatform.instance.synchronizeContent();
+Future synchronizeMapsIndoorsContent() =>
+ MapsindoorsPlatform.instance.synchronizeContent();
/// Gets the User Roles for the current solution
///
/// Note that role names are localized
-Future getUserRoles() => MapsindoorsPlatform.instance.getUserRoles();
+Future getUserRoles() =>
+ MapsindoorsPlatform.instance.getUserRoles();
/// Returns the list of [MPUserRole] that is currently applied
-Future?> getAppliedUserRoles() => MapsindoorsPlatform.instance.getAppliedUserRoles();
+Future?> getAppliedUserRoles() =>
+ MapsindoorsPlatform.instance.getAppliedUserRoles();
/// Applies a list of [MPUserRole]s to the SDK which will get the UserRole specific locations.
-Future applyUserRoles(List userRoles) => MapsindoorsPlatform.instance.applyUserRoles(userRoles);
+Future applyUserRoles(List userRoles) =>
+ MapsindoorsPlatform.instance.applyUserRoles(userRoles);
/// Get a [MPGeocodeResult] that contains lists of [MPLocation] (grouped by [MPLocationType]),
/// where the [point] is inside the locations geometry. When no floor index is set, locations on all floors are queried.
-Future reverseGeoCode(MPPoint point) => MapsindoorsPlatform.instance.reverseGeoCode(point);
+Future reverseGeoCode(MPPoint point) =>
+ MapsindoorsPlatform.instance.reverseGeoCode(point);
/// Gets the default venue for this solution
-Future getDefaultVenue() => MapsindoorsPlatform.instance.getDefaultVenue();
+Future getDefaultVenue() =>
+ MapsindoorsPlatform.instance.getDefaultVenue();
diff --git a/mapsindoors_mapbox/lib/core/mapsindoors_widget.dart b/lib/core/mapsindoors_widget.dart
similarity index 84%
rename from mapsindoors_mapbox/lib/core/mapsindoors_widget.dart
rename to lib/core/mapsindoors_widget.dart
index 65bb730..0a11284 100644
--- a/mapsindoors_mapbox/lib/core/mapsindoors_widget.dart
+++ b/lib/core/mapsindoors_widget.dart
@@ -33,7 +33,8 @@ class MapsIndoorsWidget extends UniqueWidget {
this.useDefaultMapsIndoorsStyle = true,
}) : super(key: new GlobalObjectKey(MapsIndoorsWidget)) {
if (this.readyListener != null) {
- MapcontrolPlatform.instance.setOnMapControlReadyListener(this.readyListener!);
+ MapcontrolPlatform.instance
+ .setOnMapControlReadyListener(this.readyListener!);
}
}
@@ -56,8 +57,10 @@ class MapsIndoorsWidget extends UniqueWidget {
}
/// Select a building, optionally move the camera to the given building
- Future selectBuilding(FutureOr building, bool moveCamera) async {
- return MapcontrolPlatform.instance.selectBuilding(await building, moveCamera);
+ Future selectBuilding(
+ FutureOr building, bool moveCamera) async {
+ return MapcontrolPlatform.instance
+ .selectBuilding(await building, moveCamera);
}
/// Invoke this method to restore the map to its default state (POIs shown based on their display rules, etc.)
@@ -73,8 +76,10 @@ class MapsIndoorsWidget extends UniqueWidget {
}
/// Use this method to display temporary locations, not points of interests location. Use [clearFilter()] to exit this state
- Future setFilterWithLocations(List locations, MPFilterBehavior behavior) {
- return MapcontrolPlatform.instance.setFilterWithLocations(locations, behavior);
+ Future setFilterWithLocations(
+ List locations, MPFilterBehavior behavior) {
+ return MapcontrolPlatform.instance
+ .setFilterWithLocations(locations, behavior);
}
/// Shows or hides the [MPFloorSelectorInterface], i.e. hiding the View from [MapsIndoorsWidget]
@@ -165,8 +170,10 @@ class MapsIndoorsWidget extends UniqueWidget {
/// Optionally apply a [MPSelectionBehavior]
///
/// Use [deSelectLocation()] or send null instead of a [MPLocation] to un-select the location.
- Future selectLocation(FutureOr location, [MPSelectionBehavior? behavior]) async {
- return MapcontrolPlatform.instance.selectLocation(await location, behavior ?? MPSelectionBehavior.DEFAULT);
+ Future selectLocation(FutureOr location,
+ [MPSelectionBehavior? behavior]) async {
+ return MapcontrolPlatform.instance.selectLocation(
+ await location, behavior ?? MPSelectionBehavior.DEFAULT);
}
/// Selects a location based on a id string object.
@@ -175,7 +182,8 @@ class MapsIndoorsWidget extends UniqueWidget {
///
/// Use [deSelectLocation] or send null instead of a [MPLocation] to un-select the location.
Future selectLocationById(String id, [MPSelectionBehavior? behavior]) {
- return MapcontrolPlatform.instance.selectLocationById(id, behavior ?? MPSelectionBehavior.DEFAULT);
+ return MapcontrolPlatform.instance
+ .selectLocationById(id, behavior ?? MPSelectionBehavior.DEFAULT);
}
/// Returns the current [MPFloor] of the current [MPBuilding] in focus
@@ -211,7 +219,8 @@ class MapsIndoorsWidget extends UniqueWidget {
/// Enables live data on a specific domain and uses MapsIndoors standard graphic implementation
///
/// Uses a domainType string, use [LiveDataDomainTypes] to get supported strings
- Future enableLiveData(String domainType, [OnLiveLocationUpdateListener? listener]) {
+ Future enableLiveData(String domainType,
+ [OnLiveLocationUpdateListener? listener]) {
return MapcontrolPlatform.instance.enableLiveData(domainType, listener);
}
@@ -242,22 +251,28 @@ class MapsIndoorsWidget extends UniqueWidget {
/// Set a location selection listener, invoked when a location is selected,
/// either by tapping on it, or programmatically with [selectLocation]
- void setOnLocationSelectedListener(OnLocationSelectedListener? listener, [bool? consumeEvent]) {
- MapcontrolPlatform.instance.setOnLocationSelectedListener(listener, consumeEvent);
+ void setOnLocationSelectedListener(OnLocationSelectedListener? listener,
+ [bool? consumeEvent]) {
+ MapcontrolPlatform.instance
+ .setOnLocationSelectedListener(listener, consumeEvent);
}
/// Set a listener for when the map has been tapped
- void setOnMapClickListener(OnMapClickListener? listener, [bool? consumeEvent]) {
+ void setOnMapClickListener(OnMapClickListener? listener,
+ [bool? consumeEvent]) {
MapcontrolPlatform.instance.setOnMapClickListener(listener, consumeEvent);
}
/// Set a marker click event listener, invoked when a marker is clicked
- void setOnMarkerClickListener(OnMarkerClickListener? listener, [bool? consumeEvent]) {
- MapcontrolPlatform.instance.setOnMarkerClickListener(listener, consumeEvent);
+ void setOnMarkerClickListener(OnMarkerClickListener? listener,
+ [bool? consumeEvent]) {
+ MapcontrolPlatform.instance
+ .setOnMarkerClickListener(listener, consumeEvent);
}
/// Set a info window click listener, invoked when an info window is clicked
- void setOnMarkerInfoWindowClickListener(OnMarkerInfoWindowClickListener? listener) {
+ void setOnMarkerInfoWindowClickListener(
+ OnMarkerInfoWindowClickListener? listener) {
MapcontrolPlatform.instance.setOnMarkerInfoWindowClickListener(listener);
}
@@ -279,14 +294,29 @@ class MapsIndoorsWidget extends UniqueWidget {
}
/// Set a current building changed event listener, which is invoked when the currently selected building changes
- void setOnCurrentBuildingChangedListener(OnBuildingFoundAtCameraTargetListener? listener) {
+ void setOnCurrentBuildingChangedListener(
+ OnBuildingFoundAtCameraTargetListener? listener) {
MapcontrolPlatform.instance.setOnCurrentBuildingChangedListener(listener);
}
/// Set a current venue changed event listener, which is invoked when the currently selected venue changes
- void setOnCurrentVenueChangedListener(OnVenueFoundAtCameraTargetListener? listener) {
+ void setOnCurrentVenueChangedListener(
+ OnVenueFoundAtCameraTargetListener? listener) {
MapcontrolPlatform.instance.setOnCurrentVenueChangedListener(listener);
}
+
+ /// Change the appearance of the labels of POIs.
+ ///
+ /// [textSize] changes the size of the text in pts.
+ /// [color] changes the color of the text in RGB format.
+ /// [showHalo] enables/disables the white halo around the text.
+ ///
+ /// If any value is null, the corresponding field will not be updated.
+ Future setLabelOptions(
+ {num? textSize, String? color, bool showHalo = false}) {
+ return MapcontrolPlatform.instance
+ .setLabelOptions(textSize, color, showHalo);
+ }
}
class _MapsIndoorsState extends State {
@@ -308,7 +338,8 @@ class _MapsIndoorsState extends State {
"tileFadeInEnabled": widget.enabletileFadeIn,
"useDefaultMapsIndoorsStyle": widget.useDefaultMapsIndoorsStyle
}),
- "floorSelectorAutoFloorChange": widget.floorSelector?.isAutoFloorChangeEnabled == true
+ "floorSelectorAutoFloorChange":
+ widget.floorSelector?.isAutoFloorChangeEnabled == true
};
final floorSelector = widget.floorSelector ?? MPDefaultFloorSelector();
diff --git a/mapsindoors_mapbox/lib/core/mp_default_floor_selector.dart b/lib/core/mp_default_floor_selector.dart
similarity index 72%
rename from mapsindoors_mapbox/lib/core/mp_default_floor_selector.dart
rename to lib/core/mp_default_floor_selector.dart
index f22e7af..56ef8b4 100644
--- a/mapsindoors_mapbox/lib/core/mp_default_floor_selector.dart
+++ b/lib/core/mp_default_floor_selector.dart
@@ -11,7 +11,8 @@ class MPDefaultFloorSelector extends StatefulWidget with MPFloorSelector {
@override
set floors(List? floors) => callForwarder.setFloors?.call(floors);
@override
- set onFloorSelectionChangedListener(OnFloorSelectionChangedListener listener) {
+ set onFloorSelectionChangedListener(
+ OnFloorSelectionChangedListener listener) {
if (callForwarder.setOnFloorSelectionChangedListener != null) {
callForwarder.setOnFloorSelectionChangedListener?.call(listener);
} else {
@@ -20,15 +21,19 @@ class MPDefaultFloorSelector extends StatefulWidget with MPFloorSelector {
}
@override
- void setSelectedFloor(MPFloor floor) => callForwarder.setSelectedFloor?.call(floor);
+ void setSelectedFloor(MPFloor floor) =>
+ callForwarder.setSelectedFloor?.call(floor);
@override
- void setSelectedFloorByFloorIndex(int floorIndex) => callForwarder.setSelectedFloorByFloorIndex?.call(floorIndex);
+ void setSelectedFloorByFloorIndex(int floorIndex) =>
+ callForwarder.setSelectedFloorByFloorIndex?.call(floorIndex);
@override
- set userPositionFloor(int floorIndex) => callForwarder.setUserPositionFloor?.call(floorIndex);
+ set userPositionFloor(int floorIndex) =>
+ callForwarder.setUserPositionFloor?.call(floorIndex);
@override
void show(bool show) => callForwarder.show?.call(show);
@override
- void zoomLevelChanged(num newZoomLevel) => callForwarder.zoomLevelChanged?.call(newZoomLevel);
+ void zoomLevelChanged(num newZoomLevel) =>
+ callForwarder.zoomLevelChanged?.call(newZoomLevel);
@override
_FloorSelectorState createState() => _FloorSelectorState();
@@ -37,7 +42,8 @@ class MPDefaultFloorSelector extends StatefulWidget with MPFloorSelector {
class _Forwarder {
OnFloorSelectionChangedListener? listener;
Function(List? floors)? setFloors;
- Function(OnFloorSelectionChangedListener listener)? setOnFloorSelectionChangedListener;
+ Function(OnFloorSelectionChangedListener listener)?
+ setOnFloorSelectionChangedListener;
Function(MPFloor floor)? setSelectedFloor;
Function(int floorIndex)? setSelectedFloorByFloorIndex;
Function(int floorIndex)? setUserPositionFloor;
@@ -45,7 +51,8 @@ class _Forwarder {
Function(num newZoomLevel)? zoomLevelChanged;
}
-class _FloorSelectorState extends State implements MPFloorSelectorInterface {
+class _FloorSelectorState extends State
+ implements MPFloorSelectorInterface {
final List _floors = List.empty(growable: true);
OnFloorSelectionChangedListener? _listener;
bool _visible = true;
@@ -57,12 +64,16 @@ class _FloorSelectorState extends State implements MPFlo
void initState() {
super.initState();
widget.callForwarder.setFloors = (floors) => this.floors = floors;
- widget.callForwarder.setOnFloorSelectionChangedListener = (listener) => this.onFloorSelectionChangedListener = listener;
+ widget.callForwarder.setOnFloorSelectionChangedListener =
+ (listener) => this.onFloorSelectionChangedListener = listener;
widget.callForwarder.setSelectedFloor = (floor) => setSelectedFloor(floor);
- widget.callForwarder.setSelectedFloorByFloorIndex = (floorIndex) => setSelectedFloorByFloorIndex(floorIndex);
- widget.callForwarder.setUserPositionFloor = (floorIndex) => userPositionFloor = floorIndex;
+ widget.callForwarder.setSelectedFloorByFloorIndex =
+ (floorIndex) => setSelectedFloorByFloorIndex(floorIndex);
+ widget.callForwarder.setUserPositionFloor =
+ (floorIndex) => userPositionFloor = floorIndex;
widget.callForwarder.show = (show) => this.show(show);
- widget.callForwarder.zoomLevelChanged = (newZoomLevel) => zoomLevelChanged(newZoomLevel);
+ widget.callForwarder.zoomLevelChanged =
+ (newZoomLevel) => zoomLevelChanged(newZoomLevel);
if (widget.callForwarder.listener != null) {
this.onFloorSelectionChangedListener = widget.callForwarder.listener!;
}
@@ -92,7 +103,8 @@ class _FloorSelectorState extends State implements MPFlo
}
@override
- set onFloorSelectionChangedListener(OnFloorSelectionChangedListener listener) {
+ set onFloorSelectionChangedListener(
+ OnFloorSelectionChangedListener listener) {
setState(() {
_listener = listener;
});
@@ -137,7 +149,8 @@ class _FloorSelectorState extends State implements MPFlo
}
@override
- void zoomLevelChanged(num newZoomLevel) => show(newZoomLevel >= showOnZoomLevel);
+ void zoomLevelChanged(num newZoomLevel) =>
+ show(newZoomLevel >= showOnZoomLevel);
@override
Widget build(BuildContext context) {
@@ -166,5 +179,6 @@ class _FloorSelectorState extends State implements MPFlo
}
ButtonStyle _buttonStyleWithColor(Color color) {
- return ButtonStyle(backgroundColor: MaterialStateProperty.resolveWith((states) => color));
+ return ButtonStyle(
+ backgroundColor: MaterialStateProperty.resolveWith((states) => color));
}
diff --git a/mapsindoors_mapbox/lib/core/mp_directions_renderer.dart b/lib/core/mp_directions_renderer.dart
similarity index 50%
rename from mapsindoors_mapbox/lib/core/mp_directions_renderer.dart
rename to lib/core/mp_directions_renderer.dart
index ea613d0..5e2b0e6 100644
--- a/mapsindoors_mapbox/lib/core/mp_directions_renderer.dart
+++ b/lib/core/mp_directions_renderer.dart
@@ -2,7 +2,8 @@ part of mapsindoors;
class MPDirectionsRenderer {
/// Set a route to be rendered. This also resets the selected leg and step indices to 0.
- Future setRoute(MPRoute? route) => DirectionsRendererPlatform.instance.setRoute(route);
+ Future setRoute(MPRoute? route) =>
+ DirectionsRendererPlatform.instance.setRoute(route);
/// Clears the route from the map
Future clear() => DirectionsRendererPlatform.instance.clear();
@@ -15,37 +16,58 @@ class MPDirectionsRenderer {
/// Selects the previous leg if possible.
///
/// Has no effect if the first leg is selected
- Future previousLeg() => DirectionsRendererPlatform.instance.previousLeg();
+ Future previousLeg() =>
+ DirectionsRendererPlatform.instance.previousLeg();
/// Enable/Disable the polyline animation when displaying a route element on the map
- Future setAnimatedPolyline(bool animated, bool repeating, int durationMs) => DirectionsRendererPlatform.instance.setAnimatedPolyline(animated, repeating, durationMs);
+ Future setAnimatedPolyline(
+ bool animated, bool repeating, int durationMs) =>
+ DirectionsRendererPlatform.instance
+ .setAnimatedPolyline(animated, repeating, durationMs);
/// Set the colors of the polyline
- Future setPolyLineColors(String foreground, String background) => DirectionsRendererPlatform.instance.setPolyLineColors(foreground, background);
+ Future setPolyLineColors(String foreground, String background) =>
+ DirectionsRendererPlatform.instance
+ .setPolyLineColors(foreground, background);
/// Manually set the selected leg index on the route.
///
/// This may throw an exception if the resulting internal state is invalid (parsed index is out of bounds)
- Future selectLegIndex(int legIndex) => DirectionsRendererPlatform.instance.selectLegIndex(legIndex);
+ Future selectLegIndex(int legIndex) =>
+ DirectionsRendererPlatform.instance.selectLegIndex(legIndex);
/// Gets the currently selected leg's floor index.
- Future getSelectedLegFloorIndex() => DirectionsRendererPlatform.instance.getSelectedLegFloorIndex();
+ Future getSelectedLegFloorIndex() =>
+ DirectionsRendererPlatform.instance.getSelectedLegFloorIndex();
/// Set the duration of camera animations (ms).
///
/// If a duration < 0 then camera animations are disabled, and the camera will move instantly.
///
/// The value is 1000 ms by default
- Future setCameraAnimationDuration(int durationMs) => DirectionsRendererPlatform.instance.setCameraAnimationDuration(durationMs);
+ Future setCameraAnimationDuration(int durationMs) =>
+ DirectionsRendererPlatform.instance
+ .setCameraAnimationDuration(durationMs);
/// Set the [MPCameraViewFitMode] of the camera, when displaying route elements on the map.
///
/// The camera may be aligned to north, aligned with the first step, or aligned from
/// start point to end point.
- Future setCameraViewFitMode(MPCameraViewFitMode mpCameraViewFitMode) => DirectionsRendererPlatform.instance.setCameraViewFitMode(mpCameraViewFitMode);
+ Future setCameraViewFitMode(MPCameraViewFitMode mpCameraViewFitMode) =>
+ DirectionsRendererPlatform.instance
+ .setCameraViewFitMode(mpCameraViewFitMode);
/// Set a listener, which will be invoked when a new leg has been selected
///
/// This is used for when the forward/back markers are selected on the map
- Future setOnLegSelectedListener(OnLegSelectedListener? onLegSelectedListener) => DirectionsRendererPlatform.instance.setOnLegSelectedListener(onLegSelectedListener);
+ Future setOnLegSelectedListener(
+ OnLegSelectedListener? onLegSelectedListener) =>
+ DirectionsRendererPlatform.instance
+ .setOnLegSelectedListener(onLegSelectedListener);
+
+ /// Enable/Disable route leg buttons that are shown at the start and end of each leg.
+ ///
+ /// It is recommended to only disable these buttons in the case alternative UI has been created to allow for switching route legs.
+ Future showRouteLegButtons(bool show) =>
+ DirectionsRendererPlatform.instance.showRouteLegButtons(show);
}
diff --git a/mapsindoors_mapbox/lib/core/mp_directions_service.dart b/lib/core/mp_directions_service.dart
similarity index 64%
rename from mapsindoors_mapbox/lib/core/mp_directions_service.dart
rename to lib/core/mp_directions_service.dart
index e72cda0..7ba6b9e 100644
--- a/mapsindoors_mapbox/lib/core/mp_directions_service.dart
+++ b/lib/core/mp_directions_service.dart
@@ -18,18 +18,23 @@ class MPDirectionsService {
/// Add an avoidWayType, these are based on [OSM highways](https://wiki.openstreetmap.org/wiki/Key:highway)
///
/// Supported types are defined in [MPHighway]
- Future addAvoidWayType(String avoidWayType) => DirectionsServicePlatform.instance.addAvoidWayType(avoidWayType);
+ Future addAvoidWayType(String avoidWayType) =>
+ DirectionsServicePlatform.instance.addAvoidWayType(avoidWayType);
/// Clears all added avoidWayTypes
- Future clearWayType() => DirectionsServicePlatform.instance.clearWayType();
+ Future clearWayType() =>
+ DirectionsServicePlatform.instance.clearWayType();
/// Sets whether routes should use departure time or arrival time when using the transit travel mode
- Future setIsDeparture(bool isDeparture) => DirectionsServicePlatform.instance.setIsDeparture(isDeparture);
+ Future setIsDeparture(bool isDeparture) =>
+ DirectionsServicePlatform.instance.setIsDeparture(isDeparture);
/// Queries the routing network to generate a route from the [origin] to the [destination].
///
/// Can throw an [MPError] if unable to generate the route.
- Future getRoute({required MPPoint origin, required MPPoint destination}) => DirectionsServicePlatform.instance.getRoute(origin, destination);
+ Future getRoute(
+ {required MPPoint origin, required MPPoint destination}) =>
+ DirectionsServicePlatform.instance.getRoute(origin, destination);
/// defines the travel mode for routes, can be one of the following:
///
@@ -40,9 +45,11 @@ class MPDirectionsService {
/// driving
///
/// transit
- Future setTravelMode(String travelMode) => DirectionsServicePlatform.instance.setTravelMode(travelMode);
+ Future setTravelMode(String travelMode) =>
+ DirectionsServicePlatform.instance.setTravelMode(travelMode);
/// sets the wanted arrival/departure time for routes generated with this [MPDirectionsService],
/// this setting is used in conjunction with [setIsDeparture] and [setTravelMode]
- Future setTime(int time) => DirectionsServicePlatform.instance.setTime(time);
+ Future setTime(int time) =>
+ DirectionsServicePlatform.instance.setTime(time);
}
diff --git a/mapsindoors_mapbox/lib/core/mp_floor_selector.dart b/lib/core/mp_floor_selector.dart
similarity index 100%
rename from mapsindoors_mapbox/lib/core/mp_floor_selector.dart
rename to lib/core/mp_floor_selector.dart
diff --git a/mapsindoors_mapbox/lib/core/mp_map_label_font.dart b/lib/core/mp_map_label_font.dart
similarity index 100%
rename from mapsindoors_mapbox/lib/core/mp_map_label_font.dart
rename to lib/core/mp_map_label_font.dart
diff --git a/mapsindoors_mapbox/lib/mapsindoors.dart b/lib/mapsindoors.dart
similarity index 100%
rename from mapsindoors_mapbox/lib/mapsindoors.dart
rename to lib/mapsindoors.dart
diff --git a/mapsindoors_mapbox/CHANGELOG.md b/mapsindoors_mapbox/CHANGELOG.md
deleted file mode 100644
index 254eae5..0000000
--- a/mapsindoors_mapbox/CHANGELOG.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Changelog
-
-## 2.0.0
-
-* Moved from [mapsindoors](https://pub.dev/packages/mapsindoors) to allow for multiple map providers
-* Changes to classes:
- * MapControl
- * ``MapControl`` has merged with the ``MapsIndoorsWidget``, combining them into a single entity. the ``Widget`` will still be built in the build tree, and accepts a listener as a parameter to wait for the MapControl part to be initialized.
- * MapsIndoors
- * Has been split up into functions on the namespace to align better with dart language standards. Some methods have changed naming to avoid collision with popular method and parameter naming (eg. ``MapsIndoors.load()`` is now ``loadMapsIndoors()``)
-* Changes to the Widget
- * The ``MapsIndoorsWidget`` has been changed to be a [``UniqueWidget``](https://api.flutter.dev/flutter/widgets/UniqueWidget-class.html), this is to ensure that the underlying MapsIndoors in the platform code can function normally.
\ No newline at end of file
diff --git a/mapsindoors_mapbox/LICENSE b/mapsindoors_mapbox/LICENSE
deleted file mode 100644
index 75757d5..0000000
--- a/mapsindoors_mapbox/LICENSE
+++ /dev/null
@@ -1,11 +0,0 @@
-Copyright 2023 Mapspeople
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/mapsindoors_mapbox/README.md b/mapsindoors_mapbox/README.md
deleted file mode 100644
index 8439be2..0000000
--- a/mapsindoors_mapbox/README.md
+++ /dev/null
@@ -1,293 +0,0 @@
-
-A federated Flutter plugin for integrating with the native MapsIndoors SDK.
-
-| Platform | Android | iOS |
-| ------------ | ------- | ----- |
-| **Supports** | SDK 21+ | 13.0+ |
-
-# ReadMe
-
-## Features
-
-
-Use this plugin to:
-
-
-- Show indoor mapping and navigation.
-- Perform real-time wayfinding.
-- See location live updates.
-
-This plugin is based on the MapsIndoors-Mabox V4 SDK for Android and iOS.
-
-## Getting Started
-
-
-Add MapsIndoors version `2.0.0` to your `pubspec.yaml`.
-
-
-```yaml
-mapsindoors_mapbox: ^2.0.0
-```
-
-### Android
-
-
-
-#### Android Gooogle Maps Setup
-
-
-To get the underlying Mapbox map to function, you need to perform the following steps:
-
-
-1. Navigate to `android/app/src/main/res/value`.
-2. Create a file in this folder called `mapbox_api_key.xml`.
-3. Copy and paste the below code snippet and replace `YOUR_KEY_HERE` with your Mapbox API key.
-
-
-
-```xml
-
-
- YOUR_KEY_HERE
- YOUR_KEY_HERE
-
-
-```
-
-
-
-#### MapsIndoors Gradle Setup
-
-
-The plugin Gradle project has trouble resolving the MapsIndoors dependency, so to ensure that it is resolved correctly, do the following:
-
-
-1. Navigate to the app's project level `build.gradle`.
-2. add `maven { url 'https://maven.mapsindoors.com/' }` to `allprojects`/`repositories` after `mavenCentral()`
-
-
-```groovy
-allprojects {
- repositories {
- google()
- mavenCentral()
- maven { url 'https://maven.mapsindoors.com/' }
- }
-}
-```
-
-
-
-### iOS
-
-The MapsIndoors SDK requires iOS 13, so make sure that your podfile is configured for iOS 13. Add !use_frameworks inside your app target as well.
-
-```
-platform :ios, '13.0
-
-target 'MyApp' do
- use_frameworks!
-
-post_install do |installer|
- installer.pods_project.targets.each do |target|
- target.build_configurations.each do |config|
- config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES'
- end
- ...
-end
-...
-```
-
-#### Providing API key
-Navigate to your application settings and add your Mapbox public access token to info with the key MBXAccessToken
-Setup your secret access token for downloading the sdk. Read how to do this here: [Configure credentials](https://docs.mapbox.com/ios/maps/guides/install/#configure-credentials)
-
-## Usage
-
-
-This section has examples of code for the following tasks:
-
-
-- [Showing your Map](#showing-your-map)
-- [Showing a Route](#showing-a-route)
-- [Searching Locations](#searching-locations)
-- [Changing the look with DisplayRules](#changing-the-look-with-displayrules)
-
-
-
-### Showing your Map
-
-
-This snippet shows how to set up `MapsIndoors` in a Flutter application. First, the `MapsIndoorsWidget` is added to the application's build tree.
-
-Optionally we can add a `MPFloorSelector` to the map. Here we use `MPDefaultFloorSelector` as it is provided with the MapsIndoors package. The selector must be added both to the build tree as well as to `MapControl` in order to function correctly.
-
-Once `initState()` has been called, `MapsIndoors` begins initialization, and once that is done successfully, `MapControl` begins initialization.
-
-Once `MapControl` is initialized we can invoke the `goTo` method to move the camera to the default venue.
-
-
-```Dart
-import 'package:mapsindoors/mapsindoors.dart' as MapsIndoors;
-import 'package:mapsindoors/mapsindoors_library.dart';
-
-void main() {
- runApp(const MyApp());
-}
-
-class MyApp extends StatelessWidget {
- const MyApp({super.key});
-
- @override
- Widget build(BuildContext context) {
- return const MaterialApp(
- // replace the string with your own api key
- home: MapWidget("demo"),
- );
- }
-}
-
-class MapWidget extends StatefulWidget {
- final String apiKey;
-
- const MapWidget({Key? key, required this.apiKey}) : super(key: key);
-
- @override
- MapWidgetState createState() => MapWidgetState();
-}
-
-class MapWidgetState extends State {
- // Let's build a floor selector widget here, we need to add this to MapControl later.
- final _floorSelectorWidget = MPDefaultFloorSelector();
- // MapControl will be initialized after MapsIndoors.
- late final MapsIndoorsWidget _mapController;
-
- @override
- Widget build(BuildContext context) {
- return Scaffold(
- body: Container(
- // Add the MapsIndoors Widget to your Widget, it will automatically fill the container it is placed in.
- child: _mapController = MapsIndoorsWidget(
- // build with the default floor selector, this is optional.
- floorSelector: _floorSelectorWidget,
- readyListener: _mapControlReadyListener,
- ),
- ),
- );
- }
-
- @override
- void initState() {
- super.initState();
- // Start initializing mapsindoors.
- loadMapsIndoors(widget.apiKey);
- }
-
- void _mapControlReadyListener(MPError? error) async {
- if (error == null) {
- // if no errors occured during MapControl load, then we can start using the map
- // Here we move the camera to the default venue.
- _mapController.goTo(await getDefaultVenue());
-
- } else {
- print("Creating mapcontrol faced an issue: $err");
- }
- }
-}
-```
-
-### Showing a Route
-
-This code snippet initializes the `MPDirectionsService` and `MPDirectionsRenderer` classes, and uses `_mapControl` which has been initialized elsewhere.
-
-The `showRouteToLocation` function is used to query a route from the user's current position to a specified location using `directionsService.getRoute()`.
-
-If successful, the route is displayed on the map using `directionsRenderer.setRoute(route)`.
-
-
-```Dart
-// We assume MapControl has already been initialized
-late final _mapControl;
-
-// The user is positioned somewhere in the world
-var _userLocation = MPPoint.withCoordinates(longitude: -98.44, latitude: 35.16);
-/// Query a route to a location from the user's position
-void showRouteToLocation(MPLocation location) async {
- // initialize services
- final directionsService = MPDirectionsService();
- final directionsRenderer = MPDirectionsRenderer();
-
- // get the route from userlocation to the location
- directionsService.getRoute(origin: _userPosition, destination: location.point).then((route) {
- // When we have the route, we can show it on the map
- directionsRenderer.setRoute(route);
- }).catchError((err) => print("An error occured: $err")); // otherwise handle the error
-}
-```
-
-
-
-### Searching Locations
-
-
-This code snippet shows a function called `searchForParking` that takes a single argument of type `MPPoint`. The function uses `MapsIndoors` to search for locations matching the query string `"parking"` near the point specified.
-
-It mathces in the locations' descriptions, names, and external IDs to the query string. Once the search is complete, it is possible to update/get information from the locations (not specified in the code snippet).
-
-
-```Dart
-/// This method searches for locations
-void searchForParking(MPPoint point) {
- final mpq = MPQuery.builder()
- // Set the search string
- ..setQuery("parking")
- // Set the point where we would like to search around
- ..setNear(point)
- // We are searcing in the locations description, name and external id.
- ..setQueryProperties([MPLocationPropertyNames.description.name, MPLocationPropertyNames.name.name, MPLocationPropertyNames.externalId.name]);
- // Apply the query on MapsIndoors.
- getLocationsByQuery(query: mpq.build()).then((locations) {
- print("number of paring near the point: ${locations?.length}");
- // do something with the locations
- });
-}
-```
-
-
-
-### Changing the look with DisplayRules
-
-
-This code snippet shows three ways to manipulate display rules in the MapsIndoors SDK.
-
-The `hideLocationsByDefault()` method hides all markers that are not explicitly visible by setting the main display rule to not visible.
-
-The `showLocationsByDefault()` method ensures all markers are shown by setting the main display rule to visible.
-
-The `changeTypePolygonColor(String type, String color)` method changes the fill color for all polygons belonging to a specific type. It gets the display rule for the specified type using `getDisplayRuleByName`, and sets the fill color using `setPolygonFillColor`.
-
-These methods can all be used to customize the display of markers and polygons on the map.
-
-
-```Dart
-/// This method changes the main display rule to hide all markers,
-/// This will cause all locations that are not explicitly visible to be hidden.
-void hideLocationsByDefault() async {
- final MPDisplayRule? main = await getMainDisplayRule();
- main?.setVisible(false);
-}
-
-/// This method changes the main display rule to show all markers,
-/// This will cause all locations that are not explicitly visible to be shown.
-void showLocationsByDefault() async {
- final MPDisplayRule? main = await getMainDisplayRule();
- main?.setVisible(true);
-}
-
-/// This method changes the fill color for all polygons belonging to a specific [type]
-/// the [color] MUST be a valid hex color string.
-void changeTypePolygonColor(String type, String color) async {
- final MPDisplayRule? rule = await getDisplayRuleByName(type);
- rule?.setPolygonFillColor(color);
-}
-```
diff --git a/mapsindoors_mapbox/example/LICENSE b/mapsindoors_mapbox/example/LICENSE
deleted file mode 100644
index 75757d5..0000000
--- a/mapsindoors_mapbox/example/LICENSE
+++ /dev/null
@@ -1,11 +0,0 @@
-Copyright 2023 Mapspeople
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/mapsindoors_mapbox/example/README.md b/mapsindoors_mapbox/example/README.md
deleted file mode 100644
index abdbdec..0000000
--- a/mapsindoors_mapbox/example/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# mapsindoors_example
-
-Demonstrates how to use the mapsindoors plugin.
-
-## Getting Started
-
-This project is a starting point for a Flutter application.
-
-A few resources to get you started if this is your first Flutter project:
-
-- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
-
-For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
diff --git a/mapsindoors_mapbox/example/analysis_options.yaml b/mapsindoors_mapbox/example/analysis_options.yaml
deleted file mode 100644
index 61b6c4d..0000000
--- a/mapsindoors_mapbox/example/analysis_options.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file configures the analyzer, which statically analyzes Dart code to
-# check for errors, warnings, and lints.
-#
-# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
-# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
-# invoked from the command line by running `flutter analyze`.
-
-# The following line activates a set of recommended lints for Flutter apps,
-# packages, and plugins designed to encourage good coding practices.
-include: package:flutter_lints/flutter.yaml
-
-linter:
- # The lint rules applied to this project can be customized in the
- # section below to disable rules from the `package:flutter_lints/flutter.yaml`
- # included above or to enable additional rules. A list of all available lints
- # and their documentation is published at
- # https://dart-lang.github.io/linter/lints/index.html.
- #
- # Instead of disabling a lint rule for the entire project in the
- # section below, it can also be suppressed for a single line of code
- # or a specific dart file by using the `// ignore: name_of_lint` and
- # `// ignore_for_file: name_of_lint` syntax on the line or in the file
- # producing the lint.
- rules:
- # avoid_print: false # Uncomment to disable the `avoid_print` rule
- # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
-
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
diff --git a/mapsindoors_mapbox/example/android/.gitignore b/mapsindoors_mapbox/example/android/.gitignore
deleted file mode 100644
index 6f56801..0000000
--- a/mapsindoors_mapbox/example/android/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-gradle-wrapper.jar
-/.gradle
-/captures/
-/gradlew
-/gradlew.bat
-/local.properties
-GeneratedPluginRegistrant.java
-
-# Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
-key.properties
-**/*.keystore
-**/*.jks
diff --git a/mapsindoors_mapbox/example/android/app/build.gradle b/mapsindoors_mapbox/example/android/app/build.gradle
deleted file mode 100644
index d9d574a..0000000
--- a/mapsindoors_mapbox/example/android/app/build.gradle
+++ /dev/null
@@ -1,71 +0,0 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
- localPropertiesFile.withReader('UTF-8') { reader ->
- localProperties.load(reader)
- }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
- throw new FileNotFoundException()("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
- flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
- flutterVersionName = '1.0'
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
-android {
- compileSdkVersion flutter.compileSdkVersion
- ndkVersion flutter.ndkVersion
-
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-
- kotlinOptions {
- jvmTarget = '1.8'
- }
-
- sourceSets {
- main.java.srcDirs += 'src/main/kotlin'
- }
-
- defaultConfig {
- // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId "com.mapspeople.mapsindoors_example"
- // You can update the following values to match your application needs.
- // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
- minSdkVersion 21
- targetSdkVersion flutter.targetSdkVersion
- versionCode flutterVersionCode.toInteger()
- versionName flutterVersionName
- }
-
- buildTypes {
- release {
- // TODO: Add your own signing config for the release build.
- // Signing with the debug keys for now, so `flutter run --release` works.
- signingConfig signingConfigs.debug
- }
- }
-}
-
-flutter {
- source '../..'
-}
-
-dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
diff --git a/mapsindoors_mapbox/example/android/app/src/debug/AndroidManifest.xml b/mapsindoors_mapbox/example/android/app/src/debug/AndroidManifest.xml
deleted file mode 100644
index b7a9a99..0000000
--- a/mapsindoors_mapbox/example/android/app/src/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/mapsindoors_mapbox/example/android/app/src/main/AndroidManifest.xml b/mapsindoors_mapbox/example/android/app/src/main/AndroidManifest.xml
deleted file mode 100644
index 990a02d..0000000
--- a/mapsindoors_mapbox/example/android/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mapsindoors_mapbox/example/android/app/src/main/kotlin/com/mapspeople/mapsindoors_example/MainActivity.kt b/mapsindoors_mapbox/example/android/app/src/main/kotlin/com/mapspeople/mapsindoors_example/MainActivity.kt
deleted file mode 100644
index 1a7080b..0000000
--- a/mapsindoors_mapbox/example/android/app/src/main/kotlin/com/mapspeople/mapsindoors_example/MainActivity.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.mapspeople.mapsindoors_example
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity() {
-}
diff --git a/mapsindoors_mapbox/example/android/app/src/main/res/drawable-v21/launch_background.xml b/mapsindoors_mapbox/example/android/app/src/main/res/drawable-v21/launch_background.xml
deleted file mode 100644
index f74085f..0000000
--- a/mapsindoors_mapbox/example/android/app/src/main/res/drawable-v21/launch_background.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-