Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/ui-maplibre/lib/Style/index.android.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ImageSource } from '@nativescript/core';
import { StyleCommon } from './common';
import { BaseSource, GeoJsonSource } from '../sources';
import { BackgroundLayer, BaseLayer, CircleLayer, SymbolLayer } from '../layers';
import { BackgroundLayer, BaseLayer, CircleLayer, LineLayer, SymbolLayer } from '../layers';

export class Style extends StyleCommon<org.maplibre.android.maps.Style> {
public override addImage(name: string, source: ImageSource): void {
Expand Down Expand Up @@ -66,6 +66,8 @@ export class Style extends StyleCommon<org.maplibre.android.maps.Style> {
layer = BackgroundLayer.initWithNative(nLayer) as BackgroundLayer;
} else if (nLayer instanceof org.maplibre.android.style.layers.CircleLayer) {
layer = CircleLayer.initWithNative(nLayer) as CircleLayer;
} else if (nLayer instanceof org.maplibre.android.style.layers.LineLayer) {
layer = LineLayer.initWithNative(nLayer) as LineLayer;
} else if (nLayer instanceof org.maplibre.android.style.layers.SymbolLayer) {
layer = SymbolLayer.initWithNative(nLayer) as SymbolLayer;
} else {
Expand Down
4 changes: 3 additions & 1 deletion packages/ui-maplibre/lib/Style/index.ios.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ImageSource } from '@nativescript/core';
import { StyleCommon } from './common';
import { BaseSource, GeoJsonSource } from '../sources';
import { BackgroundLayer, BaseLayer, CircleLayer, SymbolLayer } from '../layers';
import { BackgroundLayer, BaseLayer, CircleLayer, LineLayer, SymbolLayer } from '../layers';

export class Style extends StyleCommon<MLNStyle> {
public override addImage(name: string, source: ImageSource) {
Expand Down Expand Up @@ -78,6 +78,8 @@ export class Style extends StyleCommon<MLNStyle> {
layer = BackgroundLayer.initWithNative(nLayer) as BackgroundLayer;
} else if (nLayer instanceof MLNCircleStyleLayer) {
layer = CircleLayer.initWithNative(nLayer) as CircleLayer;
} else if (nLayer instanceof MLNLineStyleLayer) {
layer = LineLayer.initWithNative(nLayer) as LineLayer;
} else if (nLayer instanceof MLNSymbolStyleLayer) {
layer = SymbolLayer.initWithNative(nLayer) as SymbolLayer;
} else {
Expand Down
5 changes: 5 additions & 0 deletions packages/ui-maplibre/lib/layers/LineLayer/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,9 @@ export abstract class LineLayerCommon<T> extends AbstractVectorLayer<T, LineLaye
public set lineWidth(value: PropertyValueSpecification<number>) {
this.setPropertyValueInternal('line-width', value);
}

@PaintProperty('line-opacity')
public set lineOpacity(value: PropertyValueSpecification<number>) {
this.setPropertyValueInternal('line-opacity', value);
}
}
8 changes: 8 additions & 0 deletions packages/ui-maplibre/lib/layers/LineLayer/index.android.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,12 @@ export class LineLayer extends LineLayerCommon<org.maplibre.android.style.layers
public override set lineWidth(value) {
super.lineWidth = value;
}

public override get lineOpacity() {
return this.getOrSetPropertyValueInternal('line-opacity', () => this.native.getLineOpacity().value?.floatValue?.());
}

public override set lineOpacity(value) {
super.lineOpacity = value;
}
}
3 changes: 3 additions & 0 deletions packages/ui-maplibre/lib/layers/LineLayer/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { LayerProperties } from '../BaseLayer';
export type LineLayerProperties = LayerProperties & {
'line-color': PropertyValueSpecification<ColorSpecification>;
'line-width': PropertyValueSpecification<number>;
'line-opacity': PropertyValueSpecification<number>;
};

export declare class LineLayer extends AbstractVectorLayer<any, LineLayerProperties> {
Expand All @@ -14,4 +15,6 @@ export declare class LineLayer extends AbstractVectorLayer<any, LineLayerPropert
public set lineColor(value: PropertyValueSpecification<ColorSpecification>);
public get lineWidth(): PropertyValueSpecification<number>;
public set lineWidth(value: PropertyValueSpecification<number>);
public get lineOpacity(): PropertyValueSpecification<number>;
public set lineOpacity(value: PropertyValueSpecification<number>);
}
11 changes: 11 additions & 0 deletions packages/ui-maplibre/lib/layers/LineLayer/index.ios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,15 @@ export class LineLayer extends LineLayerCommon<MLNLineStyleLayer> {
super.lineWidth = value;
this.native.lineWidth = expression?.native;
}

public override get lineOpacity() {
return this.getOrSetPropertyValueInternal('line-opacity', () => (Expression.initWithNative(this.native.lineOpacity) as Expression).toJSON());
}

public override set lineOpacity(value) {
const expression = Expression.propertyValue(value);

super.lineOpacity = value;
this.native.lineOpacity = expression?.native;
}
}
2 changes: 1 addition & 1 deletion packages/ui-maplibre/platforms/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
platform :ios, '12.0'

pod 'MapLibre', '~> 6.19.1'
pod 'MapLibre', '~> 6.23.0'