Skip to content
This repository was archived by the owner on Jun 14, 2024. It is now read-only.

Commit eff2d81

Browse files
Fix PBX file / add missing brace / silence SwiftLint
Fix product bundle identifier Fix SwiftLint line spacing warnings
1 parent 51765c3 commit eff2d81

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

Examples.xcodeproj/project.pbxproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,7 @@
10691069
};
10701070
9619628B1C581700002D3DAB = {
10711071
CreatedOnToolsVersion = 7.3;
1072-
DevelopmentTeam = GM7DBR7Y3J;
1072+
DevelopmentTeam = GJZR2MEM28;
10731073
LastSwiftMigration = 0900;
10741074
ProvisioningStyle = Automatic;
10751075
};
@@ -1247,7 +1247,7 @@
12471247
files = (
12481248
);
12491249
inputPaths = (
1250-
"${SRCROOT}/Pods/Target Support Files/Pods-DocsCode/Pods-DocsCode-frameworks.sh",
1250+
"${PODS_ROOT}/Target Support Files/Pods-DocsCode/Pods-DocsCode-frameworks.sh",
12511251
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/Mapbox.framework",
12521252
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/Mapbox.framework.dSYM",
12531253
"${BUILT_PRODUCTS_DIR}/MapboxCoreNavigation/MapboxCoreNavigation.framework",
@@ -1274,7 +1274,7 @@
12741274
);
12751275
runOnlyForDeploymentPostprocessing = 0;
12761276
shellPath = /bin/sh;
1277-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-DocsCode/Pods-DocsCode-frameworks.sh\"\n";
1277+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DocsCode/Pods-DocsCode-frameworks.sh\"\n";
12781278
showEnvVarsInLog = 0;
12791279
};
12801280
B8CEDEEE83C3362F5C012330 /* [CP] Embed Pods Frameworks */ = {
@@ -1283,7 +1283,7 @@
12831283
files = (
12841284
);
12851285
inputPaths = (
1286-
"${SRCROOT}/Pods/Target Support Files/Pods-Examples/Pods-Examples-frameworks.sh",
1286+
"${PODS_ROOT}/Target Support Files/Pods-Examples/Pods-Examples-frameworks.sh",
12871287
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/Mapbox.framework",
12881288
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/Mapbox.framework.dSYM",
12891289
);
@@ -1294,7 +1294,7 @@
12941294
);
12951295
runOnlyForDeploymentPostprocessing = 0;
12961296
shellPath = /bin/sh;
1297-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Examples/Pods-Examples-frameworks.sh\"\n";
1297+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Examples/Pods-Examples-frameworks.sh\"\n";
12981298
showEnvVarsInLog = 0;
12991299
};
13001300
D8896F91CDF96A2DF29EF047 /* [CP] Check Pods Manifest.lock */ = {
@@ -1736,14 +1736,14 @@
17361736
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
17371737
CODE_SIGN_STYLE = Automatic;
17381738
CURRENT_PROJECT_VERSION = 0;
1739-
DEVELOPMENT_TEAM = GM7DBR7Y3J;
1739+
DEVELOPMENT_TEAM = GJZR2MEM28;
17401740
FRAMEWORK_SEARCH_PATHS = (
17411741
"$(inherited)",
17421742
"$(PROJECT_DIR)",
17431743
);
17441744
INFOPLIST_FILE = Examples/Info.plist;
17451745
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1746-
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.examples6;
1746+
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.examples;
17471747
PRODUCT_NAME = "$(TARGET_NAME)";
17481748
PROVISIONING_PROFILE_SPECIFIER = "";
17491749
SWIFT_OBJC_BRIDGING_HEADER = "Examples/Examples-Bridging-Header.h";
@@ -1761,14 +1761,14 @@
17611761
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
17621762
CODE_SIGN_STYLE = Automatic;
17631763
CURRENT_PROJECT_VERSION = 0;
1764-
DEVELOPMENT_TEAM = GM7DBR7Y3J;
1764+
DEVELOPMENT_TEAM = GJZR2MEM28;
17651765
FRAMEWORK_SEARCH_PATHS = (
17661766
"$(inherited)",
17671767
"$(PROJECT_DIR)",
17681768
);
17691769
INFOPLIST_FILE = Examples/Info.plist;
17701770
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1771-
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.examples6;
1771+
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.examples;
17721772
PRODUCT_NAME = "$(TARGET_NAME)";
17731773
PROVISIONING_PROFILE_SPECIFIER = "";
17741774
SWIFT_OBJC_BRIDGING_HEADER = "Examples/Examples-Bridging-Header.h";

Examples/Swift/SymbolLayerZOrderExample.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ func mapView(_ mapView: MGLMapView, didFinishLoading style: MGLStyle) {
3535
// Add icons to the map's style.
3636
style.setImage(UIImage(named: "oval")!, forName: "oval")
3737
style.setImage(UIImage(named: "squircle")!, forName: "squircle")
38-
style.setImage(UIImage(named: "star")!, forName: "star"
39-
38+
style.setImage(UIImage(named: "star")!, forName: "star")
39+
4040
let feature1 = MGLPointFeature()
4141
feature1.coordinate = CLLocationCoordinate2DMake(-41.292650, 174.778768)
4242
feature1.attributes = ["id": "squircle"]
@@ -46,24 +46,24 @@ func mapView(_ mapView: MGLMapView, didFinishLoading style: MGLStyle) {
4646
let feature3 = MGLPointFeature()
4747
feature3.coordinate = CLLocationCoordinate2DMake(-41.292650, 174.778768)
4848
feature3.attributes = ["id": "star"]
49-
49+
5050
let shapeCollection = MGLShapeCollectionFeature(shapes: [feature1, feature2, feature3])
5151
let source = MGLShapeSource(identifier: "symbol-layer-z-order-example", shape: shapeCollection, options: nil)
5252
style.addSource(source)
5353
let layer = MGLSymbolStyleLayer(identifier: "points-style", source: source)
5454
layer.sourceLayerIdentifier = "symbol-layer-z-order-example"
55-
55+
5656
// Create a stops dictionary with keys that are possible values for 'id', paired with icon images that will represent those features.
5757
let icons = ["squircle": "squircle", "oval": "oval", "star": "star"]
5858
// Use the stops dictionary to assign an icon based on the "POITYPE" for each feature.
5959
layer.iconImageName = NSExpression(format: "FUNCTION(%@, 'valueForKeyPath:', id)", icons)
60-
60+
6161
layer.iconAllowsOverlap = NSExpression(forConstantValue: true)
6262
layer.symbolZOrder = NSExpression(forConstantValue: "source")
6363
style.addLayer(layer)
64-
64+
6565
self.symbolLayer = layer
66-
66+
6767
// Create a UISegmentedControl to toggle between map styles
6868
let styleToggle = UISegmentedControl(items: ["viewport-y", "source"])
6969
styleToggle.translatesAutoresizingMaskIntoConstraints = false
@@ -74,7 +74,7 @@ func mapView(_ mapView: MGLMapView, didFinishLoading style: MGLStyle) {
7474
styleToggle.selectedSegmentIndex = 1
7575
view.insertSubview(styleToggle, aboveSubview: mapView)
7676
styleToggle.addTarget(self, action: #selector(toggleLayer(sender:)), for: .valueChanged)
77-
77+
7878
// Configure autolayout constraints for the UISegmentedControl to align
7979
// at the bottom of the map view and above the Mapbox logo and attribution
8080
NSLayoutConstraint.activate([NSLayoutConstraint(item: styleToggle, attribute: NSLayoutAttribute.centerX, relatedBy: NSLayoutRelation.equal, toItem: mapView, attribute: NSLayoutAttribute.centerX, multiplier: 1.0, constant: 0.0)])

0 commit comments

Comments
 (0)