Implement MGLForegroundStyleLayer.sourceIdentifier (#7570)

* [ios, macos] sourceIdentifier accessor methods

* [ios, macos] generate style code
This commit is contained in:
Fredrik Karlsson
2017-01-03 10:25:17 +01:00
committed by GitHub
parent d35f235dae
commit 1aab26e315
6 changed files with 45 additions and 2 deletions

View File

@@ -54,6 +54,13 @@ namespace mbgl {
super.rawLayer = rawLayer;
}
- (NSString *)sourceIdentifier
{
MGLAssertStyleLayerIsValid();
return @(self.rawLayer->getSourceID().c_str());
}
- (NSString *)sourceLayerIdentifier
{
MGLAssertStyleLayerIsValid();

View File

@@ -49,6 +49,13 @@ namespace mbgl {
super.rawLayer = rawLayer;
}
- (NSString *)sourceIdentifier
{
MGLAssertStyleLayerIsValid();
return @(self.rawLayer->getSourceID().c_str());
}
- (NSString *)sourceLayerIdentifier
{
MGLAssertStyleLayerIsValid();

View File

@@ -61,6 +61,13 @@ namespace mbgl {
super.rawLayer = rawLayer;
}
- (NSString *)sourceIdentifier
{
MGLAssertStyleLayerIsValid();
return @(self.rawLayer->getSourceID().c_str());
}
- (NSString *)sourceLayerIdentifier
{
MGLAssertStyleLayerIsValid();

View File

@@ -41,6 +41,13 @@
super.rawLayer = rawLayer;
}
- (NSString *)sourceIdentifier
{
MGLAssertStyleLayerIsValid();
return @(self.rawLayer->getSourceID().c_str());
}
#pragma mark - Adding to and removing from a map view
- (void)addToMapView:(MGLMapView *)mapView belowLayer:(MGLStyleLayer *)otherLayer

View File

@@ -89,7 +89,15 @@ namespace mbgl {
super.rawLayer = rawLayer;
}
<% if (type !== 'background' && type !== 'raster') { -%>
<% if (type !== 'background') { -%>
- (NSString *)sourceIdentifier
{
MGLAssertStyleLayerIsValid();
return @(self.rawLayer->getSourceID().c_str());
}
<% if (type !== 'raster') { -%>
- (NSString *)sourceLayerIdentifier
{
MGLAssertStyleLayerIsValid();
@@ -119,7 +127,7 @@ namespace mbgl {
return [NSPredicate mgl_predicateWithFilter:self.rawLayer->getFilter()];
}
<% } -%>
<% }} -%>
#pragma mark - Adding to and removing from a map view
- (void)addToMapView:(MGLMapView *)mapView belowLayer:(MGLStyleLayer *)otherLayer

View File

@@ -108,6 +108,13 @@ namespace mbgl {
super.rawLayer = rawLayer;
}
- (NSString *)sourceIdentifier
{
MGLAssertStyleLayerIsValid();
return @(self.rawLayer->getSourceID().c_str());
}
- (NSString *)sourceLayerIdentifier
{
MGLAssertStyleLayerIsValid();