Skip to content

Add layer refactoring #8

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Dec 4, 2020
Merged

Add layer refactoring #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9fa5ad7
chore: addLayers refactored
Dec 3, 2020
9b5d19f
Merge branch 'master' of https://github.com/nativescript-community/ui…
Dec 3, 2020
7a9bd38
feat: more paint and layout properties for LineLayer supported
Dec 3, 2020
d104637
feat: added addImage + SymbolLayer support
Dec 4, 2020
21fc3fa
chore: fixed minor code issues
Dec 4, 2020
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
Binary file added demo/app/App_Resources/Android/src/main/res/drawable-hdpi/bee.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/app/App_Resources/Android/src/main/res/drawable-ldpi/bee.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/app/App_Resources/Android/src/main/res/drawable-mdpi/bee.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/bee.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/bee.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/bee.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions demo/app/App_Resources/iOS/Assets.xcassets/bee.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "bee@1x.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "bee@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x",
"filename" : "bee@3x.png"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added demo/app/App_Resources/iOS/Assets.xcassets/bee.imageset/bee@1x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/app/App_Resources/iOS/Assets.xcassets/bee.imageset/bee@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/app/App_Resources/iOS/Assets.xcassets/bee.imageset/bee@3x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/app/assets/pizza-slice.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
242 changes: 131 additions & 111 deletions demo/app/main-view-model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { ContentView } from '@nativescript/core/ui/content-view';
import { AlertOptions, alert } from '@nativescript/core/ui/dialogs';
import { DownloadProgress, LatLng, MapStyle, Mapbox, MapboxMarker, MapboxView, OfflineRegion, Viewport } from '@nativescript-community/ui-mapbox';
import { SETTINGS } from '../../mapbox_config';
import { AmsterdamHoneyBees } from './sample-data';

const isIOS = platform.Device.os === platform.platformNames.ios;

Expand Down Expand Up @@ -380,8 +381,6 @@ export class HelloWorldModel extends Observable {
);
}

// -------------------------------------------------------------------------------

public doAddAndClusterGeoJSON(): void {
this.mapbox
.addGeoJsonClustered({
Expand Down Expand Up @@ -418,150 +417,173 @@ export class HelloWorldModel extends Observable {
);
}

public doAddLayerAndSource(): void {
public async doAddLayerAndSource(): Promise<void> {
try {

this.mapbox
.addSource('custom-collection-1', {
type: 'geojson',
url: null,
data: {
type: 'FeatureCollection',
features: [
{
type: 'Feature',
properties: {},
geometry: {
type: 'LineString',
coordinates: [
[4.744720458984375, 52.47357958606801],
[5.108642578125, 52.24882376803033],
],
},
},
{
this.mapbox
.addLayer({
id: 'circle-with-source-object',
type: 'circle',
source: {
type: 'geojson',
data: {
type: 'Feature',
properties: {},
geometry: {
type: 'Point',
coordinates: [4.823684692382513, 52.3701494345567],
},
},
{
},
paint: {
'circle-blur': 0.2,
'circle-radius': 10,
'circle-opacity': 0.65,
'circle-color': '#ed6498',
'circle-stroke-width': 4,
'circle-stroke-color': '#3b0619',
'circle-stroke-opacity': 0.75,
},
})
.then(() => console.log('circle-with-source-object added'));

this.mapbox
.addLayer({
id: 'line-with-source-object',
type: 'line',
source: {
type: 'geojson',
data: {
type: 'Feature',
properties: {},
geometry: {
type: 'Point',
coordinates: [4.8703765869140625, 52.3479242945069],
type: 'LineString',
coordinates: [
[4.80926513671875, 52.27403984182285],
[4.9383544921875, 52.30931825948968],
],
},
},
{
},
layout: {
'line-cap': 'round',
'line-join': 'round',
'line-blur': 0.2,
},
paint: {
'line-color': '#ab111b',
'line-width': 5,
'line-opacity': 0.7,
'line-dash-array': [1, 1, 1, 1],
},
})
.then(() => console.log('line-with-source-object added'));

this.mapbox
.addLayer({
id: 'fill-with-source-object',
type: 'fill',
source: {
type: 'geojson',
data: {
type: 'Feature',
properties: {},
geometry: {
type: 'LineString',
type: 'Polygon',
coordinates: [
[4.7989654541015625, 52.40577019043],
[4.7866058349609375, 52.36008660493161],
[4.854583740234375, 52.32736657808751],
[4.9376678466796875, 52.338695481504814],
[
[4.864797592163086, 52.346980527061895],
[4.923677444458008, 52.346980527061895],
[4.923677444458008, 52.36742431104005],
[4.864797592163086, 52.36742431104005],
[4.864797592163086, 52.346980527061895],
],
],
},
},
],
},
})
.then(() => {
console.log('source with id custom-collection-1 successfully added');

this.mapbox
.addLayer({
id: 'line-layer-1',
type: 'line',
source: 'custom-collection-1',
layout: {
'line-cap': 'butt',
'line-join': 'bevel',
},
paint: {
'line-color': '#053481',
'line-width': 5,
'line-opacity': 0.8,
'line-dash-array': [1, 1, 1, 1],
},
})
.then(() => console.log('line-layer-1 added to source custom-collection-1'));
},
paint: {
'fill-antialias': 'true',
'fill-color': '#5dbcd2',
'fill-opacity': 0.65,
'fill-outline-color': '#23474f',
'fill-translate': [0, 0],
'fill-translate-anchor': 'map',
},
})
.then(() => console.log('fill-with-source-object added'));

this.mapbox
.addLayer({
id: 'circle-layer-1',
type: 'circle',
source: 'custom-collection-1',
paint: {
'circle-radius': 2,
'circle-opacity': 0.05,
'circle-color': '#ed6498',
'circle-stroke-width': 2,
'circle-stroke-color': '#ed6498',
},
})
.then(() => console.log('circle-layer-1 added to source custom-collection-1'));
});
await this.mapbox.addImage('bee', 'res://bee');
await this.mapbox.addImage('pizza', '~/assets/pizza-slice.png');

this.mapbox.addLayer({
id: 'layer-with-source-object',
type: 'line',
source: {
type: 'geojson',
data: {
type: 'Feature',
properties: {},
geometry: {
type: 'LineString',
coordinates: [
[4.80926513671875, 52.27403984182285],
[4.9383544921875, 52.30931825948968],
],
this.mapbox
.addLayer({
id: 'symbol-with-source-object',
type: 'symbol',
source: {
type: 'geojson',
data: AmsterdamHoneyBees,
},
}
},
layout: {
'line-cap': 'square',
'line-join': 'round',
'line-blur': 15
},
paint: {
'line-color': '#5dbcd2',
'line-width': 8,
'line-opacity': 0.5
}
}).then(() => console.log('layer-with-source-object added'));
layout: {
'text-field': 'Honey',
'icon-size': 0.2,
'icon-image': 'bee',
},
paint: {
'text-color': '#d6c80d',
},
})
.then(() => console.log('symbol-with-source-object added'));

this.mapbox
.addLayer({
id: 'symbol-with-source-object2',
type: 'symbol',
source: {
type: 'geojson',
data: {
type: 'Feature',
properties: {},
geometry: {
type: 'Point',
coordinates: [4.8916793, 52.3690958]
},
},
},
layout: {
'text-field': 'New York Pizza',
'icon-size': 0.99,
'icon-image': 'pizza',
'icon-rotate': 180
},
paint: {
'text-color': '#d6c80d'
}
})
.then(() => console.log('symbol-with-source-object2 added'));
} catch (error) {
console.error('Mapbox doAddLayerAndSource error :', error);

}


}

public doRemoveLayerAndSource(): void {
Promise.all([
this.mapbox.removeLayer('line-layer-1'),
this.mapbox.removeLayer('circle-layer-1'),
this.mapbox.removeLayer('layer-with-source-object')
this.mapbox.removeLayer('circle-with-source-object'),
this.mapbox.removeLayer('line-with-source-object'),
this.mapbox.removeLayer('fill-with-source-object'),
this.mapbox.removeLayer('symbol-with-source-object'),
this.mapbox.removeLayer('symbol-with-source-object2'),
]).then(() => {
return Promise.all([
this.mapbox.removeSource('custom-collection-1'),
this.mapbox.removeSource('layer-with-source-object_source')
this.mapbox.removeSource('line-with-source-object_source'),
this.mapbox.removeSource('circle-with-source-object_source'),
this.mapbox.removeSource('fill-with-source-object_source'),
this.mapbox.removeSource('symbol-with-source-object_source'),
this.mapbox.removeSource('symbol-with-source-object2_source'),
]);
})
});
}

// ===============================================================

// -------------------------------------------------------------------------------

public doListOfflineRegions(): void {
this.mapbox
.listOfflineRegions({
Expand All @@ -587,8 +609,6 @@ export class HelloWorldModel extends Observable {
);
}

// -------------------------------------------------------------------------------

public doDeleteOfflineRegion(): void {
this.mapbox
.deleteOfflineRegion({
Expand Down
Loading