Skip to content
This repository was archived by the owner on Aug 8, 2023. It is now read-only.

Commit 5a41967

Browse files
frederonifrederoni
committed
[ios, macos] #5626 - removed unnecessary style classes
1 parent caeda59 commit 5a41967

23 files changed

+140
-90
lines changed

‎platform/darwin/scripts/generate-style-code.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ global.setterImplementation = function(property, layerType = null) {
7373
case 'enum':
7474
return `// TODO: setterEnum`;
7575
case 'color':
76-
//fillLayer->setFillColor([MGLStyleAttribute colorPropertyValueWith:fillColor]);
77-
return `${layerType}Layer->set${camelize(property.name)}([MGLStyleAttribute colorPropertyValueWith:${camelizeWithLeadingLowercase(property.name)}]);`;
76+
//fillLayer->setFillColor([MGLStyleAttribute colorPropertyValueWith:fillColor]);//fillLayer->setFillColor(fillColor.colorValue.mbgl_color);
77+
return `${layerType}Layer->set${camelize(property.name)}(${camelizeWithLeadingLowercase(property.name)}.colorValue.mbgl_propertyValue);`;
7878
case 'array':
7979
return '// TODO: setterArray';
8080
default: throw new Error(`unknown type for ${property.name}`)
@@ -92,7 +92,7 @@ global.getterImplementation = function(property, layerType = null) {
9292
case 'enum':
9393
return `return [[MGLStyleAttribute alloc] init]; //return ${prefix}${camelize(layerType)}${suffix}${camelize(property.name)}${camelize(property.values[0])};`
9494
case 'color':
95-
return `return [[MGLStyleAttribute alloc] init]; //return [MGLColor mbgl_color:${camelizeWithLeadingLowercase(layerType)}Layer->get${camelize(property.name)}().asConstant()];`;
95+
return `return [MGLColor mbgl_propertyValue:${camelizeWithLeadingLowercase(layerType)}Layer->get${camelize(property.name)}()];`
9696
case 'array':
9797
return 'return [[MGLStyleAttribute alloc] init]; //return @[]; // TODO: getterArray';
9898
default:

‎platform/darwin/src/MGLBackgroundStyleLayer.mm

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ - (void)setLayer:(mbgl::style::Layer *)layer
2323

2424
- (void)setBackgroundColor:(id <MGLStyleAttributeValue>)backgroundColor
2525
{
26-
backgroundLayer->setBackgroundColor([MGLStyleAttribute colorPropertyValueWith:backgroundColor]);
26+
backgroundLayer->setBackgroundColor(backgroundColor.colorValue.mbgl_propertyValue);
2727
}
2828
- (id <MGLStyleAttributeValue>)backgroundColor
2929
{
30-
return [[MGLStyleAttribute alloc] init]; //return [MGLColor mbgl_color:backgroundLayer->getBackgroundColor().asConstant()];
30+
return [MGLColor mbgl_propertyValue:backgroundLayer->getBackgroundColor()];
3131
}
3232
- (void)setBackgroundPattern:(id <MGLStyleAttributeValue>)backgroundPattern
3333
{

‎platform/darwin/src/MGLCircleStyleLayer.mm

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ - (void)setCircleRadius:(id <MGLStyleAttributeValue>)circleRadius
3131
}
3232
- (void)setCircleColor:(id <MGLStyleAttributeValue>)circleColor
3333
{
34-
circleLayer->setCircleColor([MGLStyleAttribute colorPropertyValueWith:circleColor]);
34+
circleLayer->setCircleColor(circleColor.colorValue.mbgl_propertyValue);
3535
}
3636
- (id <MGLStyleAttributeValue>)circleColor
3737
{
38-
return [[MGLStyleAttribute alloc] init]; //return [MGLColor mbgl_color:circleLayer->getCircleColor().asConstant()];
38+
return [MGLColor mbgl_propertyValue:circleLayer->getCircleColor()];
3939
}
4040
- (void)setCircleBlur:(id <MGLStyleAttributeValue>)circleBlur
4141
{

‎platform/darwin/src/MGLFillStyleLayer.mm

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@ - (void)setFillOpacity:(id <MGLStyleAttributeValue>)fillOpacity
3939
}
4040
- (void)setFillColor:(id <MGLStyleAttributeValue>)fillColor
4141
{
42-
fillLayer->setFillColor([MGLStyleAttribute colorPropertyValueWith:fillColor]);
42+
fillLayer->setFillColor(fillColor.colorValue.mbgl_propertyValue);
4343
}
4444
- (id <MGLStyleAttributeValue>)fillColor
4545
{
46-
return [[MGLStyleAttribute alloc] init]; //return [MGLColor mbgl_color:fillLayer->getFillColor().asConstant()];
46+
return [MGLColor mbgl_propertyValue:fillLayer->getFillColor()];
4747
}
4848
- (void)setFillOutlineColor:(id <MGLStyleAttributeValue>)fillOutlineColor
4949
{
50-
fillLayer->setFillOutlineColor([MGLStyleAttribute colorPropertyValueWith:fillOutlineColor]);
50+
fillLayer->setFillOutlineColor(fillOutlineColor.colorValue.mbgl_propertyValue);
5151
}
5252
- (id <MGLStyleAttributeValue>)fillOutlineColor
5353
{
54-
return [[MGLStyleAttribute alloc] init]; //return [MGLColor mbgl_color:fillLayer->getFillOutlineColor().asConstant()];
54+
return [MGLColor mbgl_propertyValue:fillLayer->getFillOutlineColor()];
5555
}
5656
- (void)setFillTranslate:(id <MGLStyleAttributeValue>)fillTranslate
5757
{

‎platform/darwin/src/MGLLineStyleLayer.mm

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ - (void)setLineOpacity:(id <MGLStyleAttributeValue>)lineOpacity
7373
}
7474
- (void)setLineColor:(id <MGLStyleAttributeValue>)lineColor
7575
{
76-
lineLayer->setLineColor([MGLStyleAttribute colorPropertyValueWith:lineColor]);
76+
lineLayer->setLineColor(lineColor.colorValue.mbgl_propertyValue);
7777
}
7878
- (id <MGLStyleAttributeValue>)lineColor
7979
{
80-
return [[MGLStyleAttribute alloc] init]; //return [MGLColor mbgl_color:lineLayer->getLineColor().asConstant()];
80+
return [MGLColor mbgl_propertyValue:lineLayer->getLineColor()];
8181
}
8282
- (void)setLineTranslate:(id <MGLStyleAttributeValue>)lineTranslate
8383
{

‎platform/darwin/src/MGLStyle.mm

+17
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#import "MGLFillStyleLayer.h"
66
#import "MGLStyle_Private.hpp"
77
#import "MGLStyleLayer_Private.hpp"
8+
#import "MGLSource.h"
89

910
#import <mbgl/util/default_styles.hpp>
1011
#include <mbgl/style/layers/fill_layer.hpp>
@@ -66,6 +67,16 @@ + (NSURL *)emeraldStyleURL {
6667
return MGLStyleURL_emerald;
6768
}
6869

70+
- (mbgl::style::Layer *)mbglLayerWithIdentifier:(NSString *)identifier
71+
{
72+
return self.mapView.mbglMap->getLayer(identifier.UTF8String);
73+
}
74+
75+
- (mbgl::style::Source *)mbglSourceWithIdentifier:(NSString *)identifier
76+
{
77+
return self.mapView.mbglMap->getSource(identifier.UTF8String);
78+
}
79+
6980
- (MGLStyleLayer *)layerWithIdentifier:(NSString *)identifier
7081
{
7182
mbgl::style::Layer *layer = self.mapView.mbglMap->getLayer(identifier.UTF8String);
@@ -82,4 +93,10 @@ - (void)sourceTest
8293
//mbgl::style::Source<mbgl::style::VectorSource> *vectorSource = reinterpret_cast<mbgl::style::Source<VectorSource>>(source);
8394
}
8495

96+
/*
97+
- (MGLSource *)sourceWithIdentifier:(NSString *)identifier
98+
{
99+
100+
}*/
101+
85102
@end

‎platform/darwin/src/MGLStyleAttribute.mm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#import "MGLStyleAttribute.hpp"
22
#import "UIColor+MGLStyleAttributeAdditions.h"
3+
#import "UIColor+MGLAdditions.hpp"
34

45
@implementation MGLStyleAttribute
56

67
+ (mbgl::style::PropertyValue<mbgl::Color>)colorPropertyValueWith:(id<MGLStyleAttributeValue>)attributeValue
78
{
8-
MGLAttributeColor color = [attributeValue attributeColor];
9-
return mbgl::style::PropertyValue<mbgl::Color> {{ color.red, color.green, color.blue, color.alpha }};
9+
return attributeValue.colorValue.mbgl_color;
1010
}
1111

1212
@end

‎platform/darwin/src/MGLStyleAttributeFunction.h

+19-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,25 @@
11
#import <Foundation/Foundation.h>
22

3+
#import "MGLTypes.h"
4+
5+
typedef NS_ENUM(NSUInteger, MGLStyleAttributeFunctionType) {
6+
MGLStyleAttributeFunctionTypeExponential,
7+
MGLStyleAttributeFunctionTypeInterval,
8+
MGLStyleAttributeFunctionTypeCategorical
9+
};
10+
11+
NS_ASSUME_NONNULL_BEGIN
12+
313
@interface MGLStyleAttributeFunction : NSObject
414

5-
@property (nonatomic) NSArray *stops;
15+
@property (nonatomic, copy) NSArray *stops;
16+
17+
@property (nonatomic, copy, nullable) NSString *property;
18+
19+
@property (nonatomic, copy, nullable) NSNumber *base;
20+
21+
@property (nonatomic, copy, nullable) NSNumber *functionType;
622

723
@end
24+
25+
NS_ASSUME_NONNULL_END

‎platform/darwin/src/MGLStyleAttributeObject.h

-10
This file was deleted.

‎platform/darwin/src/MGLStyleAttributeObject.m

-13
This file was deleted.

‎platform/darwin/src/MGLStyleAttributeValue.h

+3-8
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22

33
#import "MGLTypes.h"
44

5-
typedef struct {
6-
float red;
7-
float green;
8-
float blue;
9-
float alpha;
10-
} MGLAttributeColor;
11-
125
@protocol MGLStyleAttributeValue <NSObject>
136
@optional
147
- (NSString *)stringValue;
158
- (MGLColor *)colorValue;
16-
- (MGLAttributeColor)attributeColor;
9+
- (NSNumber *)numberValue;
10+
- (NSValue *)valueValue;
11+
- (BOOL)isFunction;
1712
@end
1813

1914
/*

‎platform/darwin/src/MGLSymbolStyleLayer.mm

+8-8
Original file line numberDiff line numberDiff line change
@@ -373,19 +373,19 @@ - (void)setIconOpacity:(id <MGLStyleAttributeValue>)iconOpacity
373373
}
374374
- (void)setIconColor:(id <MGLStyleAttributeValue>)iconColor
375375
{
376-
symbolLayer->setIconColor([MGLStyleAttribute colorPropertyValueWith:iconColor]);
376+
symbolLayer->setIconColor(iconColor.colorValue.mbgl_propertyValue);
377377
}
378378
- (id <MGLStyleAttributeValue>)iconColor
379379
{
380-
return [[MGLStyleAttribute alloc] init]; //return [MGLColor mbgl_color:symbolLayer->getIconColor().asConstant()];
380+
return [MGLColor mbgl_propertyValue:symbolLayer->getIconColor()];
381381
}
382382
- (void)setIconHaloColor:(id <MGLStyleAttributeValue>)iconHaloColor
383383
{
384-
symbolLayer->setIconHaloColor([MGLStyleAttribute colorPropertyValueWith:iconHaloColor]);
384+
symbolLayer->setIconHaloColor(iconHaloColor.colorValue.mbgl_propertyValue);
385385
}
386386
- (id <MGLStyleAttributeValue>)iconHaloColor
387387
{
388-
return [[MGLStyleAttribute alloc] init]; //return [MGLColor mbgl_color:symbolLayer->getIconHaloColor().asConstant()];
388+
return [MGLColor mbgl_propertyValue:symbolLayer->getIconHaloColor()];
389389
}
390390
- (void)setIconHaloWidth:(id <MGLStyleAttributeValue>)iconHaloWidth
391391
{
@@ -429,19 +429,19 @@ - (void)setTextOpacity:(id <MGLStyleAttributeValue>)textOpacity
429429
}
430430
- (void)setTextColor:(id <MGLStyleAttributeValue>)textColor
431431
{
432-
symbolLayer->setTextColor([MGLStyleAttribute colorPropertyValueWith:textColor]);
432+
symbolLayer->setTextColor(textColor.colorValue.mbgl_propertyValue);
433433
}
434434
- (id <MGLStyleAttributeValue>)textColor
435435
{
436-
return [[MGLStyleAttribute alloc] init]; //return [MGLColor mbgl_color:symbolLayer->getTextColor().asConstant()];
436+
return [MGLColor mbgl_propertyValue:symbolLayer->getTextColor()];
437437
}
438438
- (void)setTextHaloColor:(id <MGLStyleAttributeValue>)textHaloColor
439439
{
440-
symbolLayer->setTextHaloColor([MGLStyleAttribute colorPropertyValueWith:textHaloColor]);
440+
symbolLayer->setTextHaloColor(textHaloColor.colorValue.mbgl_propertyValue);
441441
}
442442
- (id <MGLStyleAttributeValue>)textHaloColor
443443
{
444-
return [[MGLStyleAttribute alloc] init]; //return [MGLColor mbgl_color:symbolLayer->getTextHaloColor().asConstant()];
444+
return [MGLColor mbgl_propertyValue:symbolLayer->getTextHaloColor()];
445445
}
446446
- (void)setTextHaloWidth:(id <MGLStyleAttributeValue>)textHaloWidth
447447
{

‎platform/darwin/src/MGLVectorSource.h

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#import "MGLSource.h"
2+
3+
@interface MGLVectorSource : MGLSource
4+
5+
@end

‎platform/darwin/src/MGLVectorSource.m

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#import "MGLVectorSource.h"
2+
3+
@implementation MGLVectorSource
4+
5+
@end

‎platform/darwin/src/NSNumber+MGLStyleAttributeAdditions.h

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#import <Foundation/Foundation.h>
2+
3+
#import "MGLStyleAttributeValue.h"
4+
5+
@interface NSNumber (MGLStyleAttributeAdditions) <MGLStyleAttributeValue>
6+
7+
@end

‎platform/darwin/src/NSNumber+MGLStyleAttributeAdditions.m

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#import "NSNumber+MGLStyleAttributeAdditions.h"
2+
3+
@implementation NSNumber (MGLStyleAttributeAdditions)
4+
5+
@end

‎platform/ios/app/MBXViewController.m

+6-3
Original file line numberDiff line numberDiff line change
@@ -416,13 +416,16 @@ - (void)presentAnnotationWithCustomCallout
416416
- (void)testRuntimeStyling
417417
{
418418
MGLFillStyleLayer *waterLayer = (MGLFillStyleLayer *)[self.mapView.style layerWithIdentifier:@"water"];
419-
waterLayer.fillColor = [UIColor redColor].mgl_colorAttributeValue;
419+
waterLayer.fillColor = [UIColor redColor];
420+
//waterLayer.fillColor = [UIColor redColor].mgl_colorAttributeValue;
420421

421422
MGLFillStyleLayer *parkLayer = (MGLFillStyleLayer *)[self.mapView.style layerWithIdentifier:@"park"];
422-
parkLayer.fillColor = [UIColor greenColor].mgl_colorAttributeValue;
423+
//parkLayer.fillColor = [UIColor greenColor].mgl_colorAttributeValue;
424+
parkLayer.fillColor = [UIColor greenColor];
423425

424426
MGLFillStyleLayer *buildingLayer = (MGLFillStyleLayer *)[self.mapView.style layerWithIdentifier:@"building"];
425-
buildingLayer.fillColor = [UIColor blackColor].mgl_colorAttributeValue;
427+
//buildingLayer.fillColor = [UIColor blackColor].
428+
buildingLayer.fillColor = [UIColor blackColor];
426429

427430
//[self.mapView.style sourceTest];
428431
[waterLayer updateStyleAndClasses];

0 commit comments

Comments
 (0)