-
Notifications
You must be signed in to change notification settings - Fork 125
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: add allow-overlap for symbols #507
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,6 @@ dependencies: | |
sdk: flutter | ||
maplibre_gl_platform_interface: ^0.20.0 | ||
maplibre_gl_web: ^0.20.0 | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please revert. |
||
dev_dependencies: | ||
very_good_analysis: ^5.0.0 | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,6 +60,9 @@ class SymbolOptions { | |
/// By default, every non-specified field is null, meaning no desire to change | ||
/// symbol defaults or current configuration. | ||
const SymbolOptions({ | ||
this.iconAllowOverlap, | ||
this.iconIgnorePlacement, | ||
this.iconOptional, | ||
this.iconSize, | ||
this.iconImage, | ||
this.iconRotate, | ||
|
@@ -90,6 +93,9 @@ class SymbolOptions { | |
this.draggable, | ||
}); | ||
|
||
final bool? iconAllowOverlap; | ||
final bool? iconIgnorePlacement; | ||
final bool? iconOptional; | ||
final double? iconSize; | ||
final String? iconImage; | ||
final double? iconRotate; | ||
|
@@ -125,6 +131,9 @@ class SymbolOptions { | |
|
||
SymbolOptions copyWith(SymbolOptions changes) { | ||
return SymbolOptions( | ||
iconOptional: changes.iconOptional ?? iconOptional, | ||
iconIgnorePlacement: changes.iconIgnorePlacement ?? iconIgnorePlacement, | ||
iconAllowOverlap: changes.iconAllowOverlap ?? iconAllowOverlap, | ||
iconSize: changes.iconSize ?? iconSize, | ||
iconImage: changes.iconImage ?? iconImage, | ||
iconRotate: changes.iconRotate ?? iconRotate, | ||
|
@@ -165,6 +174,10 @@ class SymbolOptions { | |
} | ||
} | ||
|
||
addIfPresent('iconOptional', iconOptional); | ||
addIfPresent('iconIgnorePlacement', iconIgnorePlacement); | ||
addIfPresent('iconOptional', iconOptional); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Duplicate line. |
||
addIfPresent('iconAllowOverlap', iconAllowOverlap); | ||
addIfPresent('iconSize', iconSize); | ||
addIfPresent('iconImage', iconImage); | ||
addIfPresent('iconRotate', iconRotate); | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,15 +14,15 @@ flutter: | |
web: | ||
pluginClass: MapLibreMapPlugin | ||
fileName: maplibre_gl_web.dart | ||
|
||
dependencies: | ||
flutter: | ||
sdk: flutter | ||
flutter_web_plugins: | ||
sdk: flutter | ||
image: ^4.0.17 | ||
js: ">=0.6.7 <0.8.0" | ||
maplibre_gl_platform_interface: ^0.20.0 | ||
maplibre_gl_platform_interface: | ||
path: ../maplibre_gl_platform_interface | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Changing this file doesn't seem in scope for the PR. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The project uses melos to orchestrate its packages. dart pub global activate melos
melos bootstrap This will resolve the dependencies so that no changes to pubspec.yaml are necessary. |
||
meta: ^1.3.0 | ||
|
||
dev_dependencies: | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It doesn't look like you needed to change this file — all properties were already there.