diff options
Diffstat (limited to 'platform/macos')
-rw-r--r-- | platform/macos/CHANGELOG.md | 13 | ||||
-rw-r--r-- | platform/macos/ExportOptions.plist | 10 | ||||
-rw-r--r-- | platform/macos/Mapbox-macOS-SDK-symbols.podspec | 2 | ||||
-rw-r--r-- | platform/macos/Mapbox-macOS-SDK.podspec | 2 | ||||
-rw-r--r-- | platform/macos/README.md | 16 | ||||
-rw-r--r-- | platform/macos/app/ar.lproj/Localizable.strings | 0 | ||||
-rw-r--r-- | platform/macos/docs/doc-README.md | 6 | ||||
-rw-r--r-- | platform/macos/docs/pod-README.md | 14 | ||||
-rw-r--r-- | platform/macos/jazzy.yml | 3 | ||||
-rw-r--r-- | platform/macos/macos.xcodeproj/project.pbxproj | 13 | ||||
-rwxr-xr-x | platform/macos/scripts/deploy-packages.sh | 15 | ||||
-rwxr-xr-x | platform/macos/scripts/document.sh | 2 | ||||
-rwxr-xr-x | platform/macos/scripts/package.sh | 24 | ||||
-rw-r--r-- | platform/macos/sdk/es.lproj/Localizable.strings | bin | 865 -> 1716 bytes | |||
-rw-r--r-- | platform/macos/sdk/mapbox_helmet.pdf | 355 | ||||
-rw-r--r-- | platform/macos/sdk/vi.lproj/Localizable.strings | bin | 929 -> 1654 bytes | |||
-rw-r--r-- | platform/macos/src/MGLMapView.h | 12 | ||||
-rw-r--r-- | platform/macos/src/MGLMapView.mm | 4 |
18 files changed, 462 insertions, 29 deletions
diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md index 4ea1eafb89..b919cba11c 100644 --- a/platform/macos/CHANGELOG.md +++ b/platform/macos/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changelog for Mapbox macOS SDK +# Changelog for Mapbox Maps SDK for macOS ## master @@ -15,6 +15,11 @@ ## v0.6.0 +### Packaging + +* Renamed this SDK from Mapbox macOS SDK to Mapbox Maps SDK for macOS. ([#10610](https://github.com/mapbox/mapbox-gl-native/pull/10610), [#10793](https://github.com/mapbox/mapbox-gl-native/pull/10793)) +* Added a Bulgarian localization. ([#10309](https://github.com/mapbox/mapbox-gl-native/pull/10309)) + ### Networking and storage * Added a new `MGLMapSnapshotter` class for capturing rendered map images from an `MGLMapView`’s camera. ([#9891](https://github.com/mapbox/mapbox-gl-native/pull/9891)) @@ -39,15 +44,19 @@ * Fixed several bugs and performance issues related to the use of annotations backed by `MGLAnnotationImage`s. The limits on the number and size of images and glyphs has been effectively eliminated and should now depend on hardware constraints. These fixes also apply to images used to represent icons in `MGLSymbolStyleLayer`s. ([#9213](https://github.com/mapbox/mapbox-gl-native/pull/9213)) * Increased the default maximum zoom level from 20 to 22. ([#9835](https://github.com/mapbox/mapbox-gl-native/pull/9835)) * Added an `overlays` property to `MGLMapView`. ([#8617](https://github.com/mapbox/mapbox-gl-native/pull/8617)) +* Fixed incorrect hit targets for `MGLAnnotationImage`-backed annotations that caused `-[MGLMapViewDelegate mapView:didSelectAnnotation:]` to be called unnecessarily. ([#10538](https://github.com/mapbox/mapbox-gl-native/pull/10538)) * Added `-[MGLMapView cameraThatFitsShape:direction:edgePadding:]` to get a camera with zoom level and center coordinate computed to fit a shape. ([#10107](https://github.com/mapbox/mapbox-gl-native/pull/10107)) * Added support selection of shape and polyline annotations.([#9984](https://github.com/mapbox/mapbox-gl-native/pull/9984)) * Fixed an issue where a shape annotation callout was not displayed if the centroid was not visible. ([#10255](https://github.com/mapbox/mapbox-gl-native/pull/10255)) ### Other changes -* Added a Bulgarian localization. ([#10309](https://github.com/mapbox/mapbox-gl-native/pull/10309)) +* Fixed distortion in the logo view on macOS 10.13 High Sierra. ([#10606](https://github.com/mapbox/mapbox-gl-native/pull/10606)) * Fixed an issue that could cause line label rendering glitches when the line geometry is projected to a point behind the plane of the camera. ([#9865](https://github.com/mapbox/mapbox-gl-native/pull/9865)) * Fixed an issue that could cause a crash when using `-[MGLMapView flyToCamera:completionHandler:]` and related methods with zoom levels at or near the maximum value. ([#9381](https://github.com/mapbox/mapbox-gl-native/pull/9381)) +* Fixed an issue where removing a `MGLOpenGLStyleLayer` from a map might result in a crash. ([#10765](https://github.com/mapbox/mapbox-gl-native/pull/10765)) +* Added documentation for usage of coordinate bounds that cross the anti-meridian. ([#10783](https://github.com/mapbox/mapbox-gl-native/pull/10783)) +* Removed duplicated variables in `MGLMapSnapshotter`. ([#10702](https://github.com/mapbox/mapbox-gl-native/pull/10702)) ## 0.5.1 diff --git a/platform/macos/ExportOptions.plist b/platform/macos/ExportOptions.plist new file mode 100644 index 0000000000..21af10c08a --- /dev/null +++ b/platform/macos/ExportOptions.plist @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>method</key> + <string>developer-id</string> + <key>teamID</key> + <string>GJZR2MEM28</string> +</dict> +</plist> diff --git a/platform/macos/Mapbox-macOS-SDK-symbols.podspec b/platform/macos/Mapbox-macOS-SDK-symbols.podspec index dd60957bb5..ba09fce19c 100644 --- a/platform/macos/Mapbox-macOS-SDK-symbols.podspec +++ b/platform/macos/Mapbox-macOS-SDK-symbols.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |m| - version = '0.5.1' + version = '0.6.0' m.name = 'Mapbox-macOS-SDK-symbols' m.version = "#{version}-symbols" diff --git a/platform/macos/Mapbox-macOS-SDK.podspec b/platform/macos/Mapbox-macOS-SDK.podspec index 533d7499f5..6a0e7bbf28 100644 --- a/platform/macos/Mapbox-macOS-SDK.podspec +++ b/platform/macos/Mapbox-macOS-SDK.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |m| - version = '0.5.1' + version = '0.6.0' m.name = 'Mapbox-macOS-SDK' m.version = version diff --git a/platform/macos/README.md b/platform/macos/README.md index 14b3e0cf16..a29f3ad6e2 100644 --- a/platform/macos/README.md +++ b/platform/macos/README.md @@ -1,8 +1,8 @@ -# [Mapbox macOS SDK](https://mapbox.github.io/mapbox-gl-native/macos/) +# [Mapbox Maps SDK for macOS](https://mapbox.github.io/mapbox-gl-native/macos/) [![Bitrise](https://www.bitrise.io/app/155ef7da24b38dcd.svg?token=4KSOw_gd6WxTnvGE2rMttg&branch=master)](https://www.bitrise.io/app/155ef7da24b38dcd) -Put interactive, scalable world maps into your native Cocoa application with the Mapbox macOS SDK. +Put interactive, scalable world maps into your native Cocoa application with the Mapbox Maps SDK for macOS. * Mapbox-curated [map styles](https://www.mapbox.com/maps/) and [OpenStreetMap-based](https://www.mapbox.com/vector-tiles/mapbox-streets-v7/) [vector tiles](https://www.mapbox.com/vector-tiles/) make it easy to get started. * Customize every aspect of the map’s appearance in code or visually using [Mapbox Studio](https://www.mapbox.com/mapbox-studio/). @@ -12,19 +12,19 @@ Put interactive, scalable world maps into your native Cocoa application with the ![](docs/img/screenshot.jpg) -The Mapbox macOS SDK is compatible with macOS 10.10.0 and above for Cocoa applications developed in Objective-C, Swift, Interface Builder, or AppleScript. For hybrid applications, consider [Mapbox GL JS](https://github.com/mapbox/mapbox-gl-js/). +The Mapbox Maps SDK for macOS is compatible with macOS 10.10.0 and above for Cocoa applications developed in Objective-C, Swift, Interface Builder, or AppleScript. For hybrid applications, consider [Mapbox GL JS](https://github.com/mapbox/mapbox-gl-js/). Information for Mac developers: -* [Integrate the Mapbox macOS SDK into your application](https://mapbox.github.io/mapbox-gl-native/macos/) -* [Learn how to use the Mapbox macOS SDK](https://mapbox.github.io/mapbox-gl-native/macos/) +* [Integrate the Mapbox Maps SDK for macOS into your application](https://mapbox.github.io/mapbox-gl-native/macos/) +* [Learn how to use the Mapbox Maps SDK for macOS](https://mapbox.github.io/mapbox-gl-native/macos/) * [Browse example styles designed in Mapbox Studio](https://www.mapbox.com/gallery/) Information for contributors: -* [Build the Mapbox macOS SDK from source](INSTALL.md) -* [Contribute to the Mapbox macOS SDK](DEVELOPING.md) +* [Build the Mapbox Maps SDK for macOS from source](INSTALL.md) +* [Contribute to the Mapbox Maps SDK for macOS](DEVELOPING.md) * [Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/) * [Mapbox Vector Tile Specification](https://www.mapbox.com/developers/vector-tiles/) -Mapbox does not officially support the Mapbox macOS SDK to the same extent as the Mapbox iOS SDK; however, bug reports and pull requests are certainly welcome. +Mapbox does not officially support the macOS SDK to the same extent as the iOS SDK; however, bug reports and pull requests are certainly welcome. diff --git a/platform/macos/app/ar.lproj/Localizable.strings b/platform/macos/app/ar.lproj/Localizable.strings new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/platform/macos/app/ar.lproj/Localizable.strings diff --git a/platform/macos/docs/doc-README.md b/platform/macos/docs/doc-README.md index 391b3dfca5..8089ae17d1 100644 --- a/platform/macos/docs/doc-README.md +++ b/platform/macos/docs/doc-README.md @@ -1,9 +1,9 @@ -# [Mapbox macOS SDK](https://github.com/mapbox/mapbox-gl-native/tree/master/platform/macos/) +# [Mapbox Maps SDK for macOS](https://github.com/mapbox/mapbox-gl-native/tree/master/platform/macos/) -The Mapbox macOS SDK is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa applications on macOS 10.10.0 and above using Objective-C, Swift, Interface Builder, or AppleScript. The Mapbox macOS SDK takes stylesheets that conform to the [Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://www.mapbox.com/developers/vector-tiles/), and renders them using OpenGL. +The Mapbox Maps SDK for macOS is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa applications on macOS 10.10.0 and above using Objective-C, Swift, Interface Builder, or AppleScript. The SDK takes stylesheets that conform to the [Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://www.mapbox.com/developers/vector-tiles/), and renders them using OpenGL. ![](img/screenshot.jpg) -For setup information, consult the README.md that comes with this documentation. For further instructions, consult the [macOS SDK documentation](https://mapbox.github.io/mapbox-gl-native/macos/). The [Mapbox iOS SDK](https://www.mapbox.com/ios-sdk/)’s [API documentation](https://www.mapbox.com/ios-sdk/api/) and [online examples](https://www.mapbox.com/ios-sdk/examples/) apply to the Mapbox macOS SDK with few differences, mostly around unimplemented features like user location tracking. A [full changelog](https://github.com/mapbox/mapbox-gl-native/blob/master/platform/macos/CHANGELOG.md) is also available. +For setup information, consult the README.md that comes with this documentation. For further instructions, consult the [Mapbox Maps SDK for macOS documentation](https://mapbox.github.io/mapbox-gl-native/macos/). The [Mapbox Maps SDK for iOS](https://www.mapbox.com/ios-sdk/) has [API documentation](https://www.mapbox.com/ios-sdk/api/) and [online examples](https://www.mapbox.com/ios-sdk/examples/) that apply to the macOS SDK with few differences, mostly around unimplemented features like user location tracking. A [full changelog](https://github.com/mapbox/mapbox-gl-native/blob/master/platform/macos/CHANGELOG.md) is also available. Mapbox does not officially support the macOS SDK to the same extent as the iOS SDK; however, [bug reports and pull requests](https://github.com/mapbox/mapbox-gl-native/issues/) are certainly welcome. diff --git a/platform/macos/docs/pod-README.md b/platform/macos/docs/pod-README.md index f247277ca2..97e77673ee 100644 --- a/platform/macos/docs/pod-README.md +++ b/platform/macos/docs/pod-README.md @@ -1,6 +1,6 @@ -# [Mapbox macOS SDK](https://github.com/mapbox/mapbox-gl-native/tree/master/platform/macos/) +# [Mapbox Maps SDK for macOS](https://github.com/mapbox/mapbox-gl-native/tree/master/platform/macos/) -Put interactive, scalable world maps into your native Cocoa application with the open-source Mapbox macOS SDK. +Put interactive, scalable world maps into your native Cocoa application with the open-source Mapbox Maps SDK for macOS. * Mapbox-curated [map styles](https://www.mapbox.com/maps/) and [OpenStreetMap-based](https://www.mapbox.com/vector-tiles/mapbox-streets-v7/) [vector tiles](https://www.mapbox.com/vector-tiles/) make it easy to get started. * Customize every aspect of the map’s appearance in code or visually using [Mapbox Studio](https://www.mapbox.com/mapbox-studio/). @@ -10,21 +10,21 @@ Put interactive, scalable world maps into your native Cocoa application with the ![](https://raw.githubusercontent.com/mapbox/mapbox-gl-native/master/platform/macos/docs/img/screenshot.jpg) -The Mapbox macOS SDK is compatible with macOS 10.10.0 and above for Cocoa applications developed in Objective-C, Swift, Interface Builder, or AppleScript. For hybrid applications, consider [Mapbox GL JS](https://www.mapbox.com/mapbox-gl-js/). +The Mapbox Maps SDK for macOS is compatible with macOS 10.10.0 and above for Cocoa applications developed in Objective-C, Swift, Interface Builder, or AppleScript. For hybrid applications, consider [Mapbox GL JS](https://www.mapbox.com/mapbox-gl-js/). ## Installation -There are three ways to install the Mapbox macOS SDK: +There are three ways to install the Mapbox Maps SDK for macOS: ### Manually -1. Download the [latest Mapbox macOS SDK release](https://github.com/mapbox/mapbox-gl-native/releases/) from GitHub – look for a release that begins with “macos-”. +1. Download the [latest Mapbox Maps SDK for macOS release](https://github.com/mapbox/mapbox-gl-native/releases/) from GitHub – look for a release that begins with “macos-”. 1. Open the project editor, select your application target, then go to the General tab. Drag Mapbox.framework into the “Embedded Binaries” section. (Don’t drag it into the “Linked Frameworks and Libraries” section; Xcode will add it there automatically.) In the sheet that appears, make sure “Copy items if needed” is checked, then click Finish. ### Via Carthage -The Mapbox macOS SDK is a binary-only dependency, so you’ll need Carthage 0.19 or above. In your [Cartfile](https://github.com/Carthage/Carthage/blob/master/Documentation/Artifacts.md#binary-only-frameworks), specify this dependency (plus an optional version requirement): +The Mapbox Maps SDK for macOS is a binary-only dependency, so you’ll need Carthage 0.19 or above. In your [Cartfile](https://github.com/Carthage/Carthage/blob/master/Documentation/Artifacts.md#binary-only-frameworks), specify this dependency (plus an optional version requirement): ``` binary "https://mapbox.github.io/mapbox-gl-native/macos/Mapbox-macOS-SDK.json" @@ -93,6 +93,6 @@ script AppDelegate end script ``` -Full API documentation is included in this package, within the `documentation` folder, and [online](https://mapbox.github.io/mapbox-gl-native/macos/). The [Mapbox iOS SDK](https://www.mapbox.com/ios-sdk/)’s [API documentation](https://www.mapbox.com/ios-sdk/api/) and [online examples](https://www.mapbox.com/ios-sdk/examples/) apply to the Mapbox macOS SDK with few differences, mostly around unimplemented features like user location tracking. +Full API documentation is included in this package, within the `documentation` folder, and [online](https://mapbox.github.io/mapbox-gl-native/macos/). The [Mapbox Maps SDK for iOS](https://www.mapbox.com/ios-sdk/) has [API documentation](https://www.mapbox.com/ios-sdk/api/) and [online examples](https://www.mapbox.com/ios-sdk/examples/) that apply to the Mapbox Maps SDK for macOS with few differences, mostly around unimplemented features like user location tracking. Mapbox does not officially support the macOS SDK to the same extent as the iOS SDK; however, [bug reports and pull requests](https://github.com/mapbox/mapbox-gl-native/issues/) are certainly welcome. diff --git a/platform/macos/jazzy.yml b/platform/macos/jazzy.yml index 3267ccb954..bdb29a890c 100644 --- a/platform/macos/jazzy.yml +++ b/platform/macos/jazzy.yml @@ -28,6 +28,9 @@ custom_categories: - MGLMapCamera - MGLMapView - MGLMapViewDelegate + - MGLMapSnapshot + - MGLMapSnapshotOptions + - MGLMapSnapshotter - name: Shapes and Annotations children: - MGLAnnotation diff --git a/platform/macos/macos.xcodeproj/project.pbxproj b/platform/macos/macos.xcodeproj/project.pbxproj index ded17d003a..d21729341d 100644 --- a/platform/macos/macos.xcodeproj/project.pbxproj +++ b/platform/macos/macos.xcodeproj/project.pbxproj @@ -22,6 +22,9 @@ 1F7454A51ECFB00300021D39 /* MGLLight.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F7454A21ECFB00300021D39 /* MGLLight.mm */; }; 1F7454AB1ED1DDBD00021D39 /* MGLLightTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F7454AA1ED1DDBD00021D39 /* MGLLightTest.mm */; }; 1F95931B1E6DE2B600D5B294 /* MGLNSDateAdditionsTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F95931A1E6DE2B600D5B294 /* MGLNSDateAdditionsTests.mm */; }; + 1F9EF4061FBA1B0E0063FBB0 /* mapbox_helmet.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 1F9EF4051FBA1B0D0063FBB0 /* mapbox_helmet.pdf */; }; + 1FCDF1421F2A4F3600A46694 /* MGLVectorSource+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FCDF1401F2A4F3600A46694 /* MGLVectorSource+MGLAdditions.h */; }; + 1FCDF1431F2A4F3600A46694 /* MGLVectorSource+MGLAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FCDF1411F2A4F3600A46694 /* MGLVectorSource+MGLAdditions.m */; }; 30E5781B1DAA857E0050F07E /* NSImage+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 30E578141DAA7D920050F07E /* NSImage+MGLAdditions.h */; }; 3508EC641D749D39009B0EE4 /* NSExpression+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 3508EC621D749D39009B0EE4 /* NSExpression+MGLAdditions.h */; }; 3508EC651D749D39009B0EE4 /* NSExpression+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3508EC631D749D39009B0EE4 /* NSExpression+MGLAdditions.mm */; }; @@ -299,6 +302,9 @@ 1F7454A21ECFB00300021D39 /* MGLLight.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLLight.mm; sourceTree = "<group>"; }; 1F7454AA1ED1DDBD00021D39 /* MGLLightTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLLightTest.mm; sourceTree = "<group>"; }; 1F95931A1E6DE2B600D5B294 /* MGLNSDateAdditionsTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLNSDateAdditionsTests.mm; path = ../../darwin/test/MGLNSDateAdditionsTests.mm; sourceTree = "<group>"; }; + 1F9EF4051FBA1B0D0063FBB0 /* mapbox_helmet.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = mapbox_helmet.pdf; sourceTree = "<group>"; }; + 1FCDF1401F2A4F3600A46694 /* MGLVectorSource+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MGLVectorSource+MGLAdditions.h"; sourceTree = "<group>"; }; + 1FCDF1411F2A4F3600A46694 /* MGLVectorSource+MGLAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MGLVectorSource+MGLAdditions.m"; sourceTree = "<group>"; }; 30E578141DAA7D920050F07E /* NSImage+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSImage+MGLAdditions.h"; path = "src/NSImage+MGLAdditions.h"; sourceTree = SOURCE_ROOT; }; 3508EC621D749D39009B0EE4 /* NSExpression+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSExpression+MGLAdditions.h"; sourceTree = "<group>"; }; 3508EC631D749D39009B0EE4 /* NSExpression+MGLAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSExpression+MGLAdditions.mm"; sourceTree = "<group>"; }; @@ -443,6 +449,8 @@ DA737AEC1E59180E00AD2CDE /* uk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; }; DA7DC9801DED5F5C0027472F /* MGLVectorSource_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLVectorSource_Private.h; sourceTree = "<group>"; }; DA7DC9821DED647F0027472F /* MGLRasterSource_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLRasterSource_Private.h; sourceTree = "<group>"; }; + DA80E95D1FE84A300065FC9B /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = "<group>"; }; + DA80E95F1FE84A540065FC9B /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ar; path = ar.lproj/Foundation.stringsdict; sourceTree = "<group>"; }; DA839E921CC2E3400062CAFB /* Mapbox GL.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Mapbox GL.app"; sourceTree = BUILT_PRODUCTS_DIR; }; DA839E951CC2E3400062CAFB /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; DA839E961CC2E3400062CAFB /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; }; @@ -838,6 +846,7 @@ DA8933AB1CCD290700E68420 /* Localizable.strings */, DAE6C3BB1CC31F2E00DB3429 /* default_marker.pdf */, DAE6C3BC1CC31F2E00DB3429 /* mapbox.pdf */, + 1F9EF4051FBA1B0D0063FBB0 /* mapbox_helmet.pdf */, DA8933A71CCD287300E68420 /* MGLAnnotationCallout.xib */, ); name = "Kit Resources"; @@ -1376,6 +1385,7 @@ nl, hu, bg, + ar, ); mainGroup = DA839E891CC2E3400062CAFB; productRefGroup = DA839E931CC2E3400062CAFB /* Products */; @@ -1415,6 +1425,7 @@ DA8933A51CCD287300E68420 /* MGLAnnotationCallout.xib in Resources */, DA8933B51CCD2C2500E68420 /* Foundation.strings in Resources */, DA8933B81CCD2C2D00E68420 /* Foundation.stringsdict in Resources */, + 1F9EF4061FBA1B0E0063FBB0 /* mapbox_helmet.pdf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1606,6 +1617,7 @@ DAE8CCAB1E6E8B72009B5CB0 /* nl */, DA704CBE1F637531004B3F28 /* hu */, DA3389611FA3EDCE001EA329 /* bg */, + DA80E95D1FE84A300065FC9B /* ar */, ); name = Localizable.strings; sourceTree = "<group>"; @@ -1699,6 +1711,7 @@ DACFE7971F66EA0C00630DA8 /* vi */, DA3389631FA3EDF5001EA329 /* bg */, DA33896C1FA3EF51001EA329 /* hu */, + DA80E95F1FE84A540065FC9B /* ar */, ); name = Foundation.stringsdict; sourceTree = "<group>"; diff --git a/platform/macos/scripts/deploy-packages.sh b/platform/macos/scripts/deploy-packages.sh index d9d74b2867..90c3c29308 100755 --- a/platform/macos/scripts/deploy-packages.sh +++ b/platform/macos/scripts/deploy-packages.sh @@ -46,6 +46,19 @@ buildPackageStyle() { --name ${file_name} \ --file "${BINARY_DIRECTORY}/${file_name}" > /dev/null fi + if [[ ${DEPLOY_APP} == true ]]; then + cd build/macos/app + rm -f 'Mapbox GL.app.zip' + zip -yr '../deploy/Mapbox GL.app.zip' 'Mapbox GL.app' + cd - + if [[ "${GITHUB_RELEASE}" == true ]]; then + echo "Uploading ${file_name} to GitHub" + github-release upload \ + --tag "macos-v${PUBLISH_VERSION}" \ + --name ${file_name} \ + --file "${BINARY_DIRECTORY}/${file_name}" > /dev/null + fi + fi } export TRAVIS_REPO_SLUG=mapbox-gl-native @@ -114,6 +127,6 @@ if [[ "${GITHUB_RELEASE}" == true ]]; then fi buildPackageStyle "xpackage" "symbols" -buildPackageStyle "xpackage SYMBOLS=NO" +DEPLOY_APP=true buildPackageStyle "xpackage SYMBOLS=NO" step "Finished deploying ${PUBLISH_VERSION} in $(($SECONDS / 60)) minutes and $(($SECONDS % 60)) seconds" diff --git a/platform/macos/scripts/document.sh b/platform/macos/scripts/document.sh index 2e53dc359b..7960c87698 100755 --- a/platform/macos/scripts/document.sh +++ b/platform/macos/scripts/document.sh @@ -50,4 +50,4 @@ jazzy \ --output ${OUTPUT} # https://github.com/realm/jazzy/issues/411 find ${OUTPUT} -name *.html -exec \ - perl -pi -e 's/BRANDLESS_DOCSET_TITLE/macOS SDK $1/, s/Mapbox\s+(Docs|Reference)/Mapbox macOS SDK $1/' {} \; + perl -pi -e 's/BRANDLESS_DOCSET_TITLE/Maps SDK for macOS $1/, s/Mapbox\s+(Docs|Reference)/Mapbox Maps SDK for macOS $1/' {} \; diff --git a/platform/macos/scripts/package.sh b/platform/macos/scripts/package.sh index 6ae0cc65cc..a5aae24e0c 100755 --- a/platform/macos/scripts/package.sh +++ b/platform/macos/scripts/package.sh @@ -6,6 +6,7 @@ set -u NAME=Mapbox OUTPUT=build/macos/pkg +APP_OUTPUT=build/macos/app DERIVED_DATA=build/macos PRODUCTS=${DERIVED_DATA} @@ -16,13 +17,21 @@ function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; } function finish { >&2 echo -en "\033[0m"; } trap finish EXIT -rm -rf ${OUTPUT} +rm -rf ${OUTPUT} ${APP_OUTPUT} HASH=`git log | head -1 | awk '{ print $2 }' | cut -c 1-10` && true PROJ_VERSION=$(git rev-list --count HEAD) SEM_VERSION=$( git describe --tags --match=macos-v*.*.* --abbrev=0 | sed 's/^macos-v//' ) SHORT_VERSION=${SEM_VERSION%-*} +XCODEBUILD_SCHEME=dynamic +XCODEBUILD_ACTION=build +if [[ ${BUILDTYPE} == Release ]]; then + XCODEBUILD_SCHEME=macosapp + XCODEBUILD_ACTION=archive + mkdir -p ${APP_OUTPUT} +fi + step "Building targets (build ${PROJ_VERSION}, version ${SEM_VERSION})…" xcodebuild \ CURRENT_PROJECT_VERSION=${PROJ_VERSION} \ @@ -30,10 +39,12 @@ xcodebuild \ CURRENT_SEMANTIC_VERSION=${SEM_VERSION} \ CURRENT_COMMIT_HASH=${HASH} \ -derivedDataPath ${DERIVED_DATA} \ + -archivePath "${APP_OUTPUT}/macosapp.xcarchive" \ -workspace ./platform/macos/macos.xcworkspace \ - -scheme dynamic \ + -scheme ${XCODEBUILD_SCHEME} \ -configuration ${BUILDTYPE} \ - -jobs ${JOBS} | xcpretty + -jobs ${JOBS} \ + ${XCODEBUILD_ACTION} | xcpretty step "Copying dynamic framework into place" mkdir -p "${OUTPUT}/${NAME}.framework" @@ -66,6 +77,13 @@ if [[ ${BUILDTYPE} == Release ]]; then validate_dsym \ "${OUTPUT}/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" \ "${OUTPUT}/${NAME}.framework/${NAME}" + + step "Exporting Mapbox GL.app" + xcodebuild \ + -exportArchive \ + -archivePath "${APP_OUTPUT}/macosapp.xcarchive" \ + -exportPath "${APP_OUTPUT}" \ + -exportOptionsPlist platform/macos/ExportOptions.plist fi function create_podspec { diff --git a/platform/macos/sdk/es.lproj/Localizable.strings b/platform/macos/sdk/es.lproj/Localizable.strings Binary files differindex 8a9b51feb1..bf61010704 100644 --- a/platform/macos/sdk/es.lproj/Localizable.strings +++ b/platform/macos/sdk/es.lproj/Localizable.strings diff --git a/platform/macos/sdk/mapbox_helmet.pdf b/platform/macos/sdk/mapbox_helmet.pdf new file mode 100644 index 0000000000..699b2ff293 --- /dev/null +++ b/platform/macos/sdk/mapbox_helmet.pdf @@ -0,0 +1,355 @@ +%PDF-1.5
%
+1 0 obj
<</Metadata 2 0 R/OCProperties<</D<</ON[5 0 R 33 0 R]/Order 34 0 R/RBGroups[]>>/OCGs[5 0 R 33 0 R]>>/Pages 3 0 R/Type/Catalog>>
endobj
2 0 obj
<</Length 16470/Subtype/XML/Type/Metadata>>stream
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?> +<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c137 79.159768, 2016/08/11-13:24:42 "> + <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <rdf:Description rdf:about="" + xmlns:xmp="http://ns.adobe.com/xap/1.0/" + xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/" + xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/" + xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#" + xmlns:xmpG="http://ns.adobe.com/xap/1.0/g/" + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"> + <xmp:CreatorTool>Adobe Illustrator CC 2017 (Macintosh)</xmp:CreatorTool> + <xmp:CreateDate>2017-11-16T09:51:51-08:00</xmp:CreateDate> + <xmp:ModifyDate>2017-11-16T10:04:52-08:00</xmp:ModifyDate> + <xmp:MetadataDate>2017-11-16T10:04:52-08:00</xmp:MetadataDate> + <xmp:Thumbnails> + <rdf:Alt> + <rdf:li rdf:parseType="Resource"> + <xmpGImg:width>256</xmpGImg:width> + <xmpGImg:height>256</xmpGImg:height> + <xmpGImg:format>JPEG</xmpGImg:format> + <xmpGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA
AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK
DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f
Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAAEAAwER
AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA
AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB
UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE
1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ
qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy
obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp
0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo
+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7
FXYq7FUPe6jYWMfqXdwkC9ubAE/IdT9GKsbv/wAx9HhqtpFJdMOjf3aH6W+L/hcVSC7/ADH1uUkW
8cNuvY0Lt97Gn/C4qlNx5q8xT19S/lFf99n0/wDiHHFUBJfXsprJcSOfFnY/rOKqOKuxVWjvr2I1
iuJIz/kuw/UcVR9v5q8xQU9O/lNP9+H1P+J8sVTa0/MfWoqC4jhuF7mhRvvU0/DFU/sPzH0eai3c
Ulqx6t/eIPpX4v8AhcVZJZajYX0fqWlwk69+DAkfMdR9OKojFXYq7FXYq7FXYq7FXYq7FXYq7FXY
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</xmpGImg:image> + </rdf:li> + </rdf:Alt> + </xmp:Thumbnails> + <xmpTPg:NPages>1</xmpTPg:NPages> + <xmpTPg:HasVisibleTransparency>True</xmpTPg:HasVisibleTransparency> + <xmpTPg:HasVisibleOverprint>False</xmpTPg:HasVisibleOverprint> + <xmpTPg:MaxPageSize rdf:parseType="Resource"> + <stDim:w>0.222222</stDim:w> + <stDim:h>0.221944</stDim:h> + <stDim:unit>Inches</stDim:unit> + </xmpTPg:MaxPageSize> + <xmpTPg:PlateNames> + <rdf:Seq> + <rdf:li>Cyan</rdf:li> + <rdf:li>Magenta</rdf:li> + <rdf:li>Yellow</rdf:li> + <rdf:li>Black</rdf:li> + </rdf:Seq> + </xmpTPg:PlateNames> + <xmpTPg:SwatchGroups> + <rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <xmpG:groupName>Default Swatch Group</xmpG:groupName> + <xmpG:groupType>0</xmpG:groupType> + </rdf:li> + </rdf:Seq> + </xmpTPg:SwatchGroups> + <dc:format>application/pdf</dc:format> + <xmpMM:RenditionClass>proof:pdf</xmpMM:RenditionClass> + <xmpMM:DocumentID>uuid:ad04dd96-0b1b-0043-88c6-2612e9f199e0</xmpMM:DocumentID> + <xmpMM:InstanceID>uuid:fd70734a-8143-0b42-928a-90f58b786320</xmpMM:InstanceID> + </rdf:Description> + </rdf:RDF> +</x:xmpmeta> + + + + + + + + + + + + + + + + + + + + + +<?xpacket end="w"?>
endstream
endobj
3 0 obj
<</Count 1/Kids[7 0 R]/Type/Pages>>
endobj
7 0 obj
<</ArtBox[0.0 0.0 16.0 15.98]/BleedBox[0.0 0.0 16.0 15.98]/Contents 35 0 R/Group 36 0 R/LastModified(D:20171116100452-08'00')/MediaBox[0.0 0.0 16.0 15.98]/Parent 3 0 R/PieceInfo<</Illustrator 37 0 R>>/Resources<</ExtGState<</GS0 38 0 R/GS1 39 0 R>>/Properties<</MC0 33 0 R>>/XObject<</Fm0 40 0 R/Fm1 41 0 R/Fm2 42 0 R/Fm3 43 0 R>>>>/Thumb 44 0 R/TrimBox[0.0 0.0 16.0 15.98]/Type/Page>>
endobj
35 0 obj
<</Filter/FlateDecode/Length 90>>stream
+HwVu6PprqV*2P04ճP04SЅRR +@%!>n +.\qC$qCFHC]}r +8;Xp,*?`,t!f$f[~>
endstream
endobj
45 0 obj
[/Indexed/DeviceRGB 255 46 0 R]
endobj
46 0 obj
<</Filter[/ASCII85Decode/FlateDecode]/Length 428>>stream
+8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 +b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` +E1r!/,*0[*9.aFIR2&b-C#s<Xl5FH@[<=!#6V)uDBXnIr.F>oRZ7Dl%MLY\.?d>Mn +6%Q2oYfNRF$$+ON<+]RUJmC0I<jlL.oXisZ;SYU[/7#<&37rclQKqeJe#,UF7Rgb1 +VNWFKf>nDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j<etJICj7e7nPMb=O6S7UOH< +PO7r\I.Hu&e0d&E<.')fERr/l+*W,)q^D*ai5<uuLX.7g/>$XKrcYp0n+Xl_nU*O( +l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~>
endstream
endobj
40 0 obj
<</BBox[0.952377 15.0476 15.0476 0.952377]/Group 47 0 R/Length 455/Matrix[1.0 0.0 0.0 1.0 0.0 0.0]/Resources<</ExtGState<</GS0 48 0 R>>>>/Subtype/Form>>stream
+1 1 1 rg +/GS0 gs +q 1 0 0 1 11.3447 6.2625 cm +0 0 m +-1.47 -1.47 -3.642 -1.76 -5.104 -1.76 c +-5.638 -1.76 -6.179 -1.722 -6.705 -1.638 c +-7.482 2.66 -5.074 5.075 v +-4.442 5.707 -3.588 6.05 -2.689 6.05 c +-1.722 6.05 -0.792 5.661 -0.106 4.968 c +1.295 3.566 1.333 1.349 0 0 c +-3.345 8.785 m +-7.238 8.785 -10.393 5.623 -10.393 1.737 c +-10.393 -2.148 -7.23 -5.311 -3.345 -5.311 c +0.541 -5.311 3.703 -2.148 3.703 1.737 c +3.703 5.631 0.549 8.785 -3.345 8.785 c +f +Q +
endstream
endobj
41 0 obj
<</BBox[0.0 16.0 16.0 0.0]/Group 49 0 R/Length 339/Matrix[1.0 0.0 0.0 1.0 0.0 0.0]/Resources<</ExtGState<</GS0 48 0 R>>>>/Subtype/Form>>stream
+0 0 0 rg +/GS0 gs +q 1 0 0 1 8 0.9519 cm +0 0 m +-3.894 0 -7.048 3.162 -7.048 7.048 c +-7.048 10.934 -3.894 14.104 0 14.104 c +3.894 14.104 7.048 10.941 7.048 7.056 c +7.048 3.147 3.894 0 0 0 c +0 15.048 m +-4.419 15.048 -8 11.459 -8 7.048 c +-8 2.637 -4.419 -0.952 0 -0.952 c +4.419 -0.952 8 2.629 8 7.048 c +7.992 11.459 4.419 15.048 0 15.048 c +f +Q +
endstream
endobj
42 0 obj
<</BBox[4.52039 12.3142 12.318 4.51277]/Group 50 0 R/Length 300/Matrix[1.0 0.0 0.0 1.0 0.0 0.0]/Resources<</ExtGState<</GS0 48 0 R>>>>/Subtype/Form>>stream
+0 0 0 rg +/GS0 gs +q 1 0 0 1 9.501 8.1145 cm +0 0 m +-0.693 -1.425 l +-1.379 0 l +-2.796 0.693 l +-1.379 1.379 l +-0.693 2.804 l +0 1.379 l +1.417 0.693 l +h +1.729 3.116 m +0.328 4.518 -1.897 4.563 -3.23 3.23 c +-5.638 0.815 -4.861 -3.482 y +-0.564 -4.259 1.852 -1.852 v +3.177 -0.503 3.139 1.714 1.729 3.116 c +f +Q +
endstream
endobj
43 0 obj
<</BBox[6.70476 10.9181 10.9181 6.68953]/Group 51 0 R/Length 158/Matrix[1.0 0.0 0.0 1.0 0.0 0.0]/Resources<</ExtGState<</GS0 48 0 R>>>>/Subtype/Form>>stream
+1 1 1 rg +/GS0 gs +q 1 0 0 1 10.918 8.8074 cm +0 0 m +-1.417 -0.693 l +-2.11 -2.118 l +-2.796 -0.693 l +-4.213 0 l +-2.796 0.686 l +-2.11 2.111 l +-1.417 0.686 l +h +f +Q +
endstream
endobj
51 0 obj
<</I true/K false/S/Transparency/Type/Group>>
endobj
48 0 obj
<</AIS false/BM/Normal/CA 1.0/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 1.0/op false>>
endobj
50 0 obj
<</I true/K false/S/Transparency/Type/Group>>
endobj
49 0 obj
<</I true/K false/S/Transparency/Type/Group>>
endobj
47 0 obj
<</I true/K false/S/Transparency/Type/Group>>
endobj
33 0 obj
<</Intent 52 0 R/Name(Layer 1)/Type/OCG/Usage 53 0 R>>
endobj
52 0 obj
[/View/Design]
endobj
53 0 obj
<</CreatorInfo<</Creator(Adobe Illustrator 21.1)/Subtype/Artwork>>>>
endobj
38 0 obj
<</AIS false/BM/Normal/CA 0.899994/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 0.899994/op false>>
endobj
39 0 obj
<</AIS false/BM/Normal/CA 0.350006/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 0.350006/op false>>
endobj
37 0 obj
<</LastModified(D:20171116100452-08'00')/Private 54 0 R>>
endobj
54 0 obj
<</AIMetaData 55 0 R/AIPDFPrivateData1 56 0 R/AIPDFPrivateData2 57 0 R/AIPDFPrivateData3 58 0 R/ContainerVersion 11/CreatorVersion 21/NumBlock 3/RoundtripVersion 21>>
endobj
55 0 obj
<</Length 1253>>stream
+%!PS-Adobe-3.0
%%Creator: Adobe Illustrator(R) 17.0
%%AI8_CreatorVersion: 21.1.0
%%For: (Angel) ()
%%Title: (mapboxgl-logo.pdf)
%%CreationDate: 11/16/17 10:04 AM
%%Canvassize: 16383
%%BoundingBox: 2 2 19 19
%%HiResBoundingBox: 2.5 2.51000020160791 18.5 18.5100000270513
%%DocumentProcessColors: Cyan Magenta Yellow Black
%AI5_FileFormat 13.0
%AI12_BuildNumber: 326
%AI3_ColorUsage: Color
%AI7_ImageSettings: 0
%%RGBProcessColor: 0 0 0 ([Registration])
%AI3_Cropmarks: 2.5 2.51000020160791 18.5 18.4899997983921
%AI3_TemplateBox: 42.5 10.5 42.5 10.5
%AI3_TileBox: -367.5 -277.5 366.5 298.5
%AI3_DocumentPreview: None
%AI5_ArtSize: 14400 14400
%AI5_RulerUnits: 0
%AI9_ColorModel: 1
%AI5_ArtFlags: 0 0 0 1 0 0 1 0 0
%AI5_TargetResolution: 800
%AI5_NumLayers: 1
%AI17_Begin_Content_if_version_gt:17 1
%AI9_OpenToView: -11.1249999999991 25 24 1668 982 26 0 0 6 43 0 0 0 1 1 0 1 1 0 1
%AI17_Alternate_Content
%AI9_OpenToView: -11.1249999999991 25 24 1668 982 26 0 0 6 43 0 0 0 1 1 0 1 1 0 1
%AI17_End_Versioned_Content
%AI5_OpenViewLayers: 7
%%PageOrigin:-65 -26
%AI7_GridSettings: 18 8 18 8 1 0 0.800000011920929 0.800000011920929 0.800000011920929 0.899999976158142 0.899999976158142 0.899999976158142
%AI9_Flatten: 1
%AI12_CMSettings: 00.MS
%%EndComments
endstream
endobj
56 0 obj
<</Length 11231>>stream
+%%BoundingBox: 2 2 19 19
%%HiResBoundingBox: 2.5 2.51000020160791 18.5 18.5100000270513
%AI7_Thumbnail: 128 128 8
%%BeginData: 11078 Hex Bytes
%0000330000660000990000CC0033000033330033660033990033CC0033FF
%0066000066330066660066990066CC0066FF009900009933009966009999
%0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66
%00FF9900FFCC3300003300333300663300993300CC3300FF333300333333
%3333663333993333CC3333FF3366003366333366663366993366CC3366FF
%3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99
%33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033
%6600666600996600CC6600FF6633006633336633666633996633CC6633FF
%6666006666336666666666996666CC6666FF669900669933669966669999
%6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33
%66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF
%9933009933339933669933999933CC9933FF996600996633996666996699
%9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33
%99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF
%CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399
%CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933
%CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF
%CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC
%FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699
%FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33
%FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100
%000011111111220000002200000022222222440000004400000044444444
%550000005500000055555555770000007700000077777777880000008800
%000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB
%DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF
%00FF0000FFFFFF0000FF00FFFFFF00FFFFFF
%524C45FD37FFFD04A87DA87DA87DA87DA87DA87DA8A8FFA8FD66FFFD04A8
%FD197DA8A8FD5EFFA8A8FD077DA87DA87DA87DA87DA87DA87DA87DA87DA8
%7DA87DA8FD057DA8A8FD58FFA8A8FD297DA8A8FD51FFA87DA87DA87DA87D
%A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87D
%A87DA87DA87D7D7DA8A8FD4DFFA8FD337DA8A8FD48FFA8A87D7D7DA87DA8
%7DA87DA87DA87DA87DA87DA87DA87D7D7DA8FD077DA87D7D7DA87DA87DA8
%7DA87DA87DA87DA87DA87DA87D7D7DFD45FFA8FD197DA87DA8A8A87DA8A8
%A87DA8FD177DA8A8FD40FFA8A87D7D7DA87DA87DA87DA87DA87DA87DA87D
%A87DA8A8FFA8FD11FFA8A87DA87D7D7DA87DA87DA87DA87DA87DA87DA87D
%7D7DFD3EFFA8FD127DA8A8FD19FFA8FFA8A8FD117DA8FD3BFF7D7D7DA87D
%A87DA87DA87DA87DA87DA87DFD23FFA8A87D7D7DA87DA87DA87DA87DA87D
%7D7DA8A8FD36FFA8A8FD0F7DA8A8FD27FFA8A8FD0F7DFD34FFA8A87DA87D
%A87DA87DA87DA87DA87DA8A8FD2DFFA8A87DA87DA87DA87DA87DA87D7D7D
%FD32FFA8FD0E7DFD31FFA8A8FD0D7DA8FD2FFFA87D7DA87DA87DA87DA87D
%7D7DA8A8FD35FF7D7D7DA87DA87DA87DA87D7D7DA8FD2DFFFD0D7DA8FD38
%FFA8A8FD0B7DA8FD2BFF7D7D7DA87DA87DA87DA87DA8A8FD3CFFA87DA87D
%A87DA87DA87DA87DA8FD29FFFD0C7DA8FD3FFFFD0C7DA8FD26FF7D7D7DA8
%7DA87DA87D7D7DA8FD42FFA87D7DA87DA87DA87DA87DA8FD25FFFD0B7DA8
%FD44FFA8FD0B7DA8FD22FF7DA87DA87DA87DA87DA87DFD47FFA8A87DA87D
%A87DA87DA87DA8FD21FFFD0B7DFD49FFA8A8FD097DA8FD1FFF7D7D7DA87D
%A87DA87D7D7DFD4CFFA87DA87DA87DA87DA87DA8FD1DFFA8FD0A7DFD4EFF
%A8FD097DA8FD1BFFA87D7DA87DA87DA87D7D7DFD50FFA87DA87DA87DA87D
%A87DFD1AFFA8FD0A7DFD52FFA8FD097DFD19FFA87DA87DA87DA87D7D7DFD
%54FFA87DA87DA87DA87DA87DFD17FFA8FD097DFD55FFA8FD097DA8FD16FF
%7DA87DA87DA87DA87DFD57FFA8A87DA87DA87DA87D7DA8FD14FFFD097DA8
%FD2CFFFD09A8FFA8FD21FFA8FD097DFD13FFA87D7DA87DA87DA87DA8FD2A
%FFA8A87DA8FD077DA87DA87DA8A8FD1FFFA87D7DA87DA87DA87DA8FD11FF
%A8FD097DA8FD27FFA8A8FD137DA8A8FD1DFFFD097DFD11FFA87DA87DA87D
%A87DA8A8FD27FF7D7D7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87D
%A8A8FD1DFF7DA87DA87DA87D7D7DFD0FFFA8FD097DFD25FFA8FD1C7DA8A8
%FD1AFFA8FD087DA8FD0EFF7D7D7DA87DA87DA87DFD25FFA87D7DA87DA87D
%A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87D7DA8FD1AFFA8
%7DA87DA87DA87DA8FD0DFFA8FD087DA8FD24FFFD237DFD19FFA8FD087DA8
%FD0CFFA87DA87DA87DA87DA8FD24FF7D7D7DA87DA87DA87DA87DA87DA87D
%A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DFD19FF7DA87DA87D
%A87D7D7DFD0BFFA8FD087DA8FD23FFFD277DA8FD18FFFD087DA8FD0AFFA8
%7D7DA87DA87DA8A8FD23FF7D7D7DA87DA87DA87DA87DA87DA87DA87DA87D
%A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DFD18FFA87DA87DA8
%7DA87DA8FD09FFA8FD087DFD23FFFD2B7DFD17FFA8FD087DFD09FFA87DA8
%7DA87DA87DA8FD22FF7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87D
%A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87D7D7DFD17FF7DA87D
%A87DA87D7DA8FD08FFFD087DA8FD21FFA8FD167DA8A8FD167DFD16FFA8FD
%087DFD07FFA87D7DA87DA87DA87DFD21FFA87D7DA87DA87DA87DA87DA87D
%A87DA87DA87DA87DA87D7DA8FFA87D7DA87DA87DA87DA87DA87DA87DA87D
%A87DA87D7DA8FD16FFA87DA87DA87DA87DFD07FFA8FD077DA8FD20FFA8FD
%187DFFFFFFFD167DA8FD15FFA8FD087DFD06FF7DA87DA87DA87DA8FD21FF
%A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8FFFFFFA87D
%A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8FD16FF7DA87DA87DA8
%7DA8FD05FFA8FD087DFD21FFFD177DA8FD05FFFD167DFD16FFA8FD077DA8
%FD04FFA87DA87DA87DA87DA8FD20FF7DA87DA87DA87DA87DA87DA87DA87D
%A87DA87DA87DA87D7DA8FD05FFA87D7DA87DA87DA87DA87DA87DA87DA87D
%A87DA87D7D7DFD15FFA87D7DA87DA87D7DA8FD04FFFD087DA8FD1FFFA8FD
%187DFD07FFFD167DA8FD15FFFD077DA8FD04FFA87DA87DA87DA87DFD20FF
%A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8FD07FFA87D
%A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8FD15FFA87DA87DA87D
%A87DFFFFFFA8FD077DA8FD20FFFD187DA8FD07FFA8FD167DFD15FFA8FD07
%7DA8FFFFA87D7DA87DA87D7DA8FD1FFF7DA87DA87DA87DA87DA87DA87DA8
%7DA87DA87DA87DA87D7DA8FD09FFA87D7DA87DA87DA87DA87DA87DA87DA8
%7DA87DA87D7DA8FD15FF7D7D7DA87DA87DA8FFFFA8FD077DFD1FFFA8FD18
%7DFD0BFFFD157DA8FD14FFA8FD087DFFFF7DA87DA87DA87DA8FD1FFFA87D
%A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8A8FD0DFFA8A87DA87D
%A87DA87DA87DA87DA87DA87DA87DA87DFD15FF7DA87DA87DA87DA8FFA8FD
%077DA8FD1FFFFD157DA8A8FD0FFFA8A8FD127DA8FD14FFA8FD077DFFFF7D
%7D7DA87DA87DFD1FFFA8A87DA87DA87DA87DA87DA87DA87DA87DA87DA8A8
%FD15FFA8A87DA87DA87DA87DA87DA87DA87DA87DFD15FFA87D7DA87DA87D
%7DA8A8FD077DA8FD1EFFA8FD117DA8A8FD17FFA8A8FD0E7DA8FD14FFA8FD
%077DA8A87DA87DA87DA87DFD1FFF7DA87DA87DA87DA87DA87DA87DA87DA8
%A8FD1DFFA8A87DA87DA87DA87DA87DA87DA8FD14FFA8A87DA87DA87D7DA8
%FD087DA8FD1DFFA8FD0E7DA8A8FD1FFFA8A8FD0A7DA8FD15FFFD077DA8A8
%7DA87DA87DA87DFD1EFFA87DA87DA87DA87DA87DA87DA87DA87DA8A8FD1D
%FFA8A87DA87DA87DA87DA87DA87DA8FD15FFA87DA87DA87DA8FD087DA8FD
%1EFFFD137DA8A8FD17FFA8A8FD0F7DFD15FFFD077DA8A87DA87DA87DA8A8
%FD1EFFA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8A8FD15FFA8A8
%7DA87DA87DA87DA87DA87DA87DA87DA8FD15FFA87DA87DA87DA8FD087DA8
%FD1EFFFD177DA8A8FD0FFFA8A8FD127DA8FD15FFFD087DA87DA87DA87D7D
%7DFD1DFFA87D7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8
%A8FD0DFFA8A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DFD16FFA87D
%A87DA87DA8FD087DA8FD1DFFA8FD1B7DFD0BFFFD167DA8FD15FFFD087DA8
%7DA87DA87D7DA8FD1DFFA87D7DA87DA87DA87DA87DA87DA87DA87DA87DA8
%7DA87DA87DA87DA8A8FD09FFA8A87DA87DA87DA87DA87DA87DA87DA87DA8
%7DA87DA87DFD16FFA87DA87DA87DA8FD087DA8FD1DFFA8FD1B7DA8FD09FF
%FD167DA8FD16FFFD087DA87DA87DA87DA8A8FD1DFF7DA87DA87DA87DA87D
%A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8FD07FFA87DA87DA87D
%A87DA87DA87DA87DA87DA87DA87DA87D7DA8FD16FFA87DA87DA87DA8FD08
%7DA8FD1CFFA8FD1E7DFD07FFFD177DFD17FFFD087DA87DA87DA87DA87DFD
%1DFF7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8
%7DA8A8FD05FFA8A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8
%FD17FFA87DA87DA87DA8FD087DA8FD1CFFA8FD1E7DA8FD05FFFD177DA8FD
%17FFFD077DA8A87DA87DA87D7D7DFD1CFFA87DA87DA87DA87DA87DA87DA8
%7DA87DA87DA87DA87DA87DA87DA87DA87DA87DFD05FF7DA87DA87DA87DA8
%7DA87DA87DA87DA87DA87DA87D7D7DFD18FFA87DA87DA8FD0B7DA8FD1BFF
%FD217DFFFFFFFD177DA8FD18FFFD077DA8FF7DA87DA87DA87DFD1CFFA87D
%A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87D
%A8A8FFA8A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8FD18FF
%A8A87DA87DA87D7DA8A8FD077DA8FD1BFFFD217DA8FFA8FD167DA8FD18FF
%A8FD077DA8FF7DA87DA87DA87DA8FD1BFFA87DA87DA87DA87DA87DA87DA8
%7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8
%7DA87DA87DA87DA87DA87DA87D7D7DFD19FFA87D7DA87DA87DA8FFA8FD08
%7DFD1BFFFD397DFD1AFFA8FD077DFFFF7DA87DA87DA87DA8FD1BFFA87DA8
%7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8
%7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DFD1BFF7DA87DA8
%7DA87DA8FFFFA8FD077DA8FD1AFFFD377DFD1BFFA8FD087DFFFFA87D7DA8
%7DA87D7DA8FD1AFFA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87D
%A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87D
%A87DFD1CFFA87DA87DA87DA87DA8FFFFFFFD077DA8FD1AFFFD357DFD1DFF
%FD087DA8FFFFFFA87DA87DA87DA87DFD1AFFA87DA87DA87DA87DA87DA87D
%A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87D
%A87DA87DA87DA87D7D7DFD1EFFA87DA87DA87DA87DFD04FFA8FD077DA8FD
%19FFFD337DFD1EFFA8FD077DA8FD05FF7DA87DA87DA87DA8FD19FFA87DA8
%7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8
%7DA87DA87DA87DA87DA87DA87DA87DA8A8FD1FFF7DA87DA87DA87D7DA8FD
%04FFA8FD087DFD19FFFD2F7DA8A8FD1FFFA8FD087DFD06FFA87D7DA87DA8
%7DA8A8FD18FFA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87D
%A87DA87DA87DA87DA87DA87DA87DA87DA87DA87D7D7DFD22FFA87DA87DA8
%7DA87DA8FD07FFFD077DA8FD18FFA8FD2A7DA8A8FD23FFFD087DA8FD07FF
%A87DA87DA87DA87DFD19FF7DA87DA87DA87DA87DA87DA87DA87DA87DA87D
%A87DA87DA87DA87DA87DA87DA87DA87DA87D7D7DA87DFD25FFA87D7DA87D
%A87D7D7DFD08FFFD097DFD17FFA8FD267DA8A8FD26FFA8FD077DA8FD09FF
%7DA87DA87DA87DA8A8FD17FF7DA87DA87DA87DA87DA87DA87DA87DA87DA8
%7DA87DA87DA87DA87DA87DA87DA87D7D7DA8A8FD29FF7DA87DA87DA87DA8
%A8FD09FFA8FD077DA8FD16FFA8FD207DA8A8FD2BFFFD097DFD0AFFA87D7D
%A87DA87D7D7DFD17FF7DA8FD077DA87D7D7DA87D7D7DA8FD077DA87DA8A8
%FD2FFFA8A87DA87DA87DA87DFD0CFFFD097DFD17FFA8FFA8A87DA87DA87D
%A8FD057DA87DA87DFD04A8FFA8FD32FFA8FD087DFD0DFF7DA87DA87DA87D
%A8A8FD61FF7DA87DA87DA87D7DA8FD0DFFA8FD077DA8FD60FFFD097DFD0E
%FFA87D7DA87DA87DA87DA8FD5EFFA87D7DA87DA87DA87DFD10FFFD097DFD
%5DFFA8FD087DA8FD11FF7DA87DA87DA87DA87DFD5CFFA87DA87DA87DA87D
%7DA8FD11FFA8FD097DFD5AFFA8FD087DA8FD13FFA87DA87DA87DA87D7DA8
%FD58FFA87DA87DA87DA87D7D7DFD14FFA8FD097DA8FD57FFFD097DA8FD15
%FFA87D7DA87DA87DA87DA8A8FD55FF7DA87DA87DA87DA87DA8FD17FFFD0A
%7DA8FD53FFFD097DA8FD19FF7D7D7DA87DA87DA87DA8FD52FF7D7D7DA87D
%A87DA87D7DA8FD19FFA8FD097DA8A8FD4FFFFD0A7DA8FD1BFFA87DA87DA8
%7DA87DA87DA8FD4EFF7DA87DA87DA87DA87DA8A8FD1DFFA8FD097DA8FD4C
%FFFD0B7DFD1FFFA87DA87DA87DA87DA87DA8FD4AFF7D7D7DA87DA87DA87D
%7D7DFD20FFA8FD0B7DA8FD47FFFD0B7DFD23FFA87DA87DA87DA87DA87D7D
%A8FD45FF7DA87DA87DA87DA87D7D7DFD24FFA8A8FD0B7DFD42FFA8FD0B7D
%FD27FFA87DA87DA87DA87DA87D7D7DFD3FFFA8A87DA87DA87DA87DA87D7D
%7DFD28FFA8A8FD0B7DA8A8FD3BFFFD0D7DFD2BFFA87DA87DA87DA87DA87D
%A87DA8A8FD39FF7D7D7DA87DA87DA87DA87DA8A8FD2DFFA8FD0D7DFD35FF
%A8A8FD0D7DFD2FFFA87DA87DA87DA87DA87DA87D7D7DA8A8FD31FF7D7D7D
%A87DA87DA87DA87DA87DA8A8FD32FFFD0F7DA8A8FD2BFFA8A8FD0E7DA8FD
%34FFA87D7DA87DA87DA87DA87DA87D7D7DA8A8FD28FFA87DA87DA87DA87D
%A87DA87DA87DA87DA8FD37FFA8FD107DA8A8FD21FFA8A8FD117DFD3BFFA8
%7DA87DA87DA87DA87DA87DA87DA87D7D7DA8A8FD1BFFA8A87DA87D7D7DA8
%7DA87DA87DA87DA87DA87DA8A8FD3EFFFD157DFD04A8FD0DFFA8FFA8A87D
%A8FD137DA8A8FD40FFA8A87DA87DA87DA87DA87DA87DA87DA87DA87DA87D
%7D7DA87DA87DFD09A87DA87DA87D7D7DA87DA87DA87DA87DA87DA87DA87D
%A87DA87DFD45FFA8FD377DA8A8FD48FFA8A87D7D7DA87DA87DA87DA87DA8
%7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8
%7DA87DA87DA87D7D7DFD4EFFA8FD2E7DA8A8FD52FFA8A87DA87DA87DA87D
%A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87D
%A87DA8A8FD57FFA87DA8FD217DA8A8FD5EFFA8A87DA8FD077DA87DA87DA8
%7DA87DA8FD077DFD04A8FD64FFA8FFA8A87DA8FD0B7DA87DFD04A8FD34FF
%FF
%%EndData
endstream
endobj
57 0 obj
<</Filter[/FlateDecode]/Length 16229>>stream
+HWn8;pLQ/;x'a4-1'(PTo:8^[6Ūs8bJZIJPр<SRڣ=z`R +^Q1"wa^2|r@t*g|^u hxO`|E:\;$'Yƾh"Ob??`F4{x?c[ط!F8 +.drB2p!<,^&PP>qh[J)kB)`PFG{rt֨s6O#1yn#
}տ
iJCun8ds`HFE<e E&<C#R=yALɲCtK6Qݮ*-߮FЯbt1Z:R\u-]AVN~Oo!\
v}CN"k@ + U;hHi( +4X;D-\&4Zw\Z=)hLE/] +k/s<;wH|鴧
ERIIp1{Yrx1 +β2
z#8/2Ew%bMoMo?ɧl,7,!C9StYbIoIJVKq#o-4k,a z*ɹɜZc# D,tѲSFaƮn#a]=uP,>uqlRuUpX?o =܉Ч|=j#Ao +M?ɯ)鎢5[}Z*OLJ.2MLgjQ +Nz8"=MK Xg)Ifa" 8>;=w~%f從*~Ttx,WZ%'whcО̞ޓ:K(JK'_D$t`8.T?(1կ)3- +$ֹqbMDoDb'KoT;}Eyu;Ì\NPbO
P_2_C:'BA#;7B2xo%nG;0d;ep[-[ojW +{|s]-e]:}-<z`šR
+$+1qKHp"D8+{S7ӔBՉ^D4%TR$ɉd,)*pu#}/;v.("iU0Oؤ!u{ձkG?<MV/xDG4~zJ]6gų*<:M`-W>@Aa*Duc."qձQ(tsJFROW-t5YPD#xqsݾlk6.ոzW'ݓ@ܢ/w9봫#e:tҜL9e`{']lpIBXƦCqͻ<~6qdok," nq+
>3Jxcqo^FtChc5 +:*sGn:QUWvN'l!F3U.X +?t}϶#{P0hǎPDq\eh +y+ȯNB2m}%)foq
ag2iQ`chytT^Xmi!F +$gPy +',QMTx#ǓM1~(^?đ,ȏ
Z=ֱLi,JPQg h`H#9Iv$KK6|/]^`?^S^4wT%V\.r'HBpcUR)% 0 7V(6]*kRfS
gaR@q̹X<ŪBm +6{ץ<JS-p +MNnD| +]'T;"Z\ :tʰ!71 *;
I-T𪂭0!d3c-:s7?trܨbWMƠ&ܣe*|I$ȡ(dr,ʆH0<+CCvroZD.HAX-xFuo&EKLc1e.V<} +1aFGl7;زWL1t$a95.fwq'2֓@:QcjeЅiRB}aY +ngeQV{s{(FXU3(HK9dkfdn+ÑdQvư/a0e^?D<뷟jC[3N|LR ;1cFꅉЫB.RR?됁PnV_6GWh^>y8At5*:U1C' SCE]X +w +w*$
),OQتDLjttV/ura* PbgU%B/!u#+qSڵ 1噣1<&1v1婼r &yd|cp2SiJY ˉCOr(UyeCpn9z7o:P79CO *UYB +cdc&?[SBbMDM`́;j&-<&U&G:ܹ*o`|a +N^GʥPHI%#z{ugTxvZzFdIƻoǷ/g+6;M'덵՞k|IaƻΎmrx͵{m>^}6j}4|"3ѝ4l7ȨgVjɂ?ˇB6nntft;mZc{oZqցٺuvoT;k?ڇ6[6کaZkV3n[]m94SћcEßwpOSm60K'6Wki7mwtY]Y~~ۛ7#]7kN-bҏCѵ߭npSWljyts8Wz\Q, JG5Qcg47gίkNL-X6t2"qU69©`cߦl;BM9
KS*[)mN/LOI/9 +} +>?);9Pq*@}rybPF7uy=E禚ǽsF_d)Y +N` + 6n`+MvGTsg.VӢB&)Rz-e;F
Sl3rU[]'5%
0BXvƆ*1Vb*8A:#JhId#ؘ +et}2ROSMI46PW! BI⃥@y,Sy#H6Uiy!`[͕_1 T~>M~6Ȍ%"Gad̈́4wxpU +x#3NpU'bfJ>AxjK]UFo&G,ƯaKUV<H V +ۊ2GʲW&)=̽6)PDled[w^M[Q!TIV⁃\sPxA#k=+435Yb9%Qgⴷ0<|tG?h6mI'nAa bЮ\`rQVBٜɋ@Pǫ28;W_gcF2x3x潟V۶(zpwb
SQ*?6wj=Cmxzګc#$1p7hL}jΚTp0)3^n!pQp-O&%0Ǻf9NJr9:b9mzbC
%sW4u>(HhpXmqܧR7 ;jB'Ո3a`dEPاbP/o6Y@ZbYoK30>3ҚBXOE%" j`c?g##{_
WX_$=;c=S MwT) +[t6WE/B[㝛bWQ*2=>HfIM8h I*NNxWRN^$7O;",̃F\hS|^6o-N
94"VhHwbNqK\)д"4(ocg844ٟeoݨ(UAV!/NTA=մ(-a
`hm:-{#`|)I;̯y;ճXT}L6|WxPsf9 kQӡ{z)W
IN-;^,R}9kn +|VEO>bWzE~Ҋ +n(|p |UNwG1 +x'cݾaeF7k
ʡWO{K"ov~}Q7D<n5gꫬa1eIaT!i1(0Kj닐)R^~`dN)@6ZPddSWWx;:*ASvɇqqqT-*$ +Cf]L51][bQt=ڕfTd!GR[?
ߏ|7_?0=.~?.*Tl(+/2de l0/Tqm#J(ҫV-0il˼6aB+Vf +y;7?tM^j"-E
=|u`EMK^U5y4LUX<},s_Lq@Bg}]$(x,]sW&!!
Ewf@E}NpFeP Jj҆iD8#v[=^ %a,zxH; IզI?XFEBL|9ǁ_$_$ϐ +ꑸ0̴klinRڞﷶ+_l2.MSOq*>`e{⡅^(06
QFSd{<#1wva
"W{M턠]t>|zj
$r44sCc'C]H08d3nhj +w[vzVV9[*B~f3W`9+S,k?W
q/.8EmmAW +B`d6$uSdX.$ais*,?'0tvI6<>-[#%{O$<zq="!)N,9n$TS-(t(aqE㝟t+ץӇh""ٖT +mg$i!fb'Cb?.{դ>*RoF!,&B؋3xU% +ԃ]It^%;r~6݄C)Lܻk?w=g+r;sx,\%"@ +2/Q[gDd#RHwN!IL_mQ"LM'_CuHzHE:[W=ᅛ&Îq0;7N +k1
Vl&6m4gS~HSAp8jZ>7g;]MTEbLA#B4N+OK[M&!OL2/+rv.xIW&MH9Q(;)R'L߽-I?b ZS%Ԫ1M7 +2zFj$#JU
J{jlϲ9kxۇlR?`agOjTww|\K6j'%,l~do8J{ѝS6m_t"-K8x\[NB: Z|}<4N
n)X] {2pPw읋!;
P\ +rv[B]4ؼ5a,?;Xh5y(Sawӽ=%B甩O[#Rh0hz*ƘV*?'<h>+0,&m
Z-&\.EaWQB豭jFfAL"xhci/ ++Lwu:- ZO +tX 6:`"tenWxtٛ1fuQ`
<Dfr#AMdT1cvޡQAE(yiHw%d|ȫPiSQ +5ٷ~n*LY_ +D6Kh6'(bOmx
6 a-CSJEʡW@᭞ў
mT`9a$KҩE8EӅ<HJ:?HJ3őNAeQS9π*&}-bt:`8Ug!Z]EztA:
OrJU +?SB:)+{\i?#Xa|~ӌT6>Xђ[Ǣ7\-Ÿ́ђWa9CUPS~:;3v@{@.{3WvZ[7[& 4dKҏtCn_;!{G?Wbh늵hf퉺Tu}_O6x(g.vƂ\op0~Hз+м'͢B}Խ?C:h>+43١r-V%BQpC%i:D(PisXP$CõFyM4LI6.j2 +y{RQތu#7.'U4WBo؋>(?khɲjƧLϜC/L-uͧ7tE,C.{$4˷$KAFɝ]LJctRd$ߩ?m/P<>/嬰F@+#rj +ӻ3'pvWrX\>M#$5+"Jӆ}@GvPllX !+Q-/WPDө\WM~,^[ro6L4Zd>r~ -Cq!|fյ1a.
uY:>%vΑ,7{eī4YwE:N7Cy`_GW|9=We5AY2RdC"<O_uW16dnd#|i0ջ.v.Y=zv1UoOjLؙQ?1*J}cۿfB;?n+1w\ 1I(DJxiӋd+U<=̯֫Iul6e`ZvqW!<|ܖKS-/.zfs#J~D?=j1ij-yH+&"dXzi@ouL;`cgGYYpBָ$x_Dr?Ygm%M)ȺnbU=ܪ76!=D_E+SHƃJF +IUVp?nfz|dU4P:{ +Ƒá؛Dž&T[Rdt5Zfz}&m^R6:a6bdv"5i/yb=G<kǯJ=ZZt +2 +.@A!tڈ"FwbC~M5^m<xd{3QWB9
1}&Nr'Uf8ʇQcM$O>Y'WV\켕ag@0]
uttIQ'+њi@eNhI[3@(04hi(F;d`j;>1eG1LG>ȩXy<ȿJ)K"G>Uc9oebA<k/]ͷtf^@VY"d
]4c^ޠ0S32Z sΉ.r84焖 +LuB1_
'ɪ8rqDZ.]n\[
A0i!ct
=9S;rGZ;Q1g{*87u6Ya4B5k!aax5ha1gyE@5U.QU>ILNLh1>T$TQJH~CNt慰M/`j:v,!Yt\Jx<Z)^Y d\?8dd |ksW* V?ͭ)xgj +̜fUzWҤKΎIٶ4w1C4U!p68X!uGzܔf9y}ӵ81>{ARzkyq9FK.1ʡ"\8efsQ :2t)>9-59`
ē#Q6/M"[?KMׯ$k%$Mjuef aHiZi0'SãSN{2&߉ɛfC-$Xz +~=y/`0Tvwٱ.;&Sh)'/l)s^CGxf`k%K饦 +"s^I|d)^3>2sgk9#sOw
Su}*\i4o^nh!IIUv'Ƭ +)WvOABdʕ4§eFƹ#ޱᎽ5υ'->hLrr~q$h
֡~L,7+\܋WHv2uU%,íT`46*|wI;mVryC1r'\`zyr6,o֤ZfɚeBu,CV1DmBD)&q'e&CRdѦKKK'`Ckp'-UЕA +y-pZ&ݝߕP"z!G +/ajHmwIҷX*)R~!0o:]?&,3P;Վ~X@}oF9PM_3NrlvR!ek8tD)P`L$9ԙY|h`/b%l哕h}MDQ+Nا +9ظ&ҭ)A: +^b~lz|װ9G(c^^!Sa>#~DqK=T6xl-2ޏ]o1ey* +S!*GiZLuGW_!c=v'es1r\K4Dž%@_X˥@H*9/ۦT(>p/J\SS{0K&ɱFt8bw߰v^M}.+V_S}q %?<sq}Yn #z%}NJ~"݊%By(h0$(7#`bށ֯e+ !PV/c +q,KOx_̨J|\'96ȫH)AUCP@)Ztx@ܗjFgM],˃BwR֨!Y!*VDX&)ʝV7_K8-KEJ,_:|KId~8KQ'<|r!G
+HWBN}<pI*X!RzU nl-9sfJlj:mJlt3,Q8O*GuLOsIv_mȲ~1. =^R$YP%έu7K|yiMvo`{**~HJR!$ + +IA]pJ~_8-襓*XT
WD`=6WBR4d11CExX_;Tc]μNMj +|P ~UnRhb 95dW$3lymu2\#d$G:
Y%c(+ +(|Mxq:]_2;OZF + +zl2CǨaB ]րJY.馛ًlM2j$|. +m+\ :]б+#nΨ.}h[DInFD7Srú Ydj,ԡvT+aͳ'T4Z +!X)d屮WdSgļPƶ۩U.[RSΦ ރ#chb1MZCؑa ;ҿ.!Pt/I|dX2yam\w⻁MG+%f +_ϼ~.gq
C0Ogg]B6gq80:s2 +ܕ:
w%c'iڦ8A*t00xRapa'[ +vJW\S;.Ӷ۾>qekL0 hJT`kgbPAZe2']z +Ít|{]5y:o논huW3{8|wE Iac /m0"it4~!ܪwL11t;E]>Yrb::u 0끷9ɾ(tOohM9d3W +¨pÙԭf J|0S Ow2y^9<(%vٴG N߁/>Ώ(?":)I +T%5r1/`'l/9%
1^tmW6|gg1YӱR;1650ԛ'㈀8W_h(oYŬ]lӻC3 )r0 dO_efÀe<WN<)P}_c<ɡS!c}YaF5+Exlڻ[NcXPٰH!cm<N(ȊdFVX
$2b>E)1[..C
#`#*)7t0X"'&_y~-ȕ +bKfP0gq\)VPP)Ji+/[j$*rͰiGYfJ?a,psFx# c$-7q9Vv:gRCYJ4" +*ŗS9s@#}9, 4Te>4V_6\=Sijb +R +7ĺrjmU{;GKpʏd("]R̋کv~e,xs-7[P}1Tݟ^)mU&NQm料AgTyHz, ): +K3-L8rhQ\ⶑ?CW|:Fs*nsW7ӝмtɉ*2XHaZh\71EgְU@NZǂKCvjZnTJ)h +7(J36tCg +Qr+'H4"ډ(cAomh9֣H>xnP1Wˡ_ϝct9FqJ</)ЩX 1FmT_ת9[q)&~MfLnw݈Rӧ`11b|77]E6F^(+S"nbbO+{Ƹ͕!&Y8B.w!5
w
nĮAgGd#Ex?>ἅgCy)⋄7c=* ++ +Uy+?dWy\A"!-iiQZkE;TI}f̙sJߪ^/Go +$y: jK,՟=]>A}!
<C-Vh1d fXWМ@`$"aؠ4V4x7V=ʴiJ 0-I]z/d3sJ5&懷&sZW{bv +MLݡPG)|,> 4|>!NZtR09Q9zi &-BBy_Ѹ%=NA~wꝩ7~;>|;keݓ
x9^
G2"˙;oyeOn矵ᢙp-EFSBv]aܳJy3d]+3AM5xgs=gK>^ +OFO'fFc +{ +@m6FP61\ +pop +Em֨{?T{6H҉;NnHȶ +[MMZHcDPyz͞dȷݘm1'L5ν)`?LPuJP8Pg0^K3*~m#-տhԒܘ~jsm8ކoRրMrGhtу(LƷhQ+Om +Ld<r ++tXqgP:SjϺqwk@$ٝ[`7pr*iE +2wOU +X<-7p4ݛ'A?M^lvSVz +N +6@PknAD4TMlW&R^fBI6Bwa<[]~} +`
b4!#`ɣoAGzun=+N t R$ H[wf4=K&fOy晙=5S[Q +ET)r(]
CoX z]P LMg.D@nO&(ew5]ǧׂv"<3ȖiR\W]!+bBtS-ٴl3H?.c rI,&y柦˸5ufY +$[K$ ޖRQ&|#N6'V%=՚C*09#~{(n/dqf/?8Z&ZR%qp| @T~X=&&Nq
3bاu6Q^DVѢ"dZ09ze@JC=$$qwS0 +P?H+vSO`.>80*$EG+G$Tk֨Ϫ#qAo+(0Wp%JyJ,R%5ct -=ݥ"g&(UJupp]ї#HDer +`O:c4ʜO~T|`xlDixBUQų<I&\(n4:B0XϮ#g$IjgUīn>pƎhN2t<5sܑj~hg[ٚ!*A3agyhZNА,=M] m2ƀe9_%
jsR/0ED`6; +.ԭYM$-pnNQABE'x;D!l־~*Z5Rc<<ONzy:!Vv4 + +V|ǪP +B=Q]T,4C!m-:![=v^ e;L +ls`M
;\7ř{r]E"&* ȿULu:t!:y+<}ݭ[SXHԩ +MLţ++ t>\M|J +%Hp)ol5/}NɗL3:K*&U-{Y3BY!`sو +V%o@O!pXS(ol
>W'' +>*fJ
JϠDr +P~ +KTۈ;Z8TZo +W`KXrk6VLm>1QyqW
>O9ía%M^^kζt;U)^W.T`v/p\Jzc)V5B>8Fx^m?S[n?05'RxYh;kkGo|. +'ĠɃtox,<M)M:.] ]./ +{px2QcX]GgyOQ]'˶%XaJGwu?Gc&/qqP;ju=*b65STׯvgH4 +ǓAշ +eAf0PZ?`Bxأ>)BSuHyo5ɛw.Ͽ|SWce?2 Y_]ߵ9%>EBk|hZmrs6Ũucѻ\Sy8_ﺏߢEZjo7bR4X*F(k~n4}'"jC.-·5\;Dp6rgvt.^XGZgj+]9gb~(Y+-c><ז+N0f\rH͝vBq:㕑sw6]=ϑ>R[;$lR#-4YY+&VJMZ`[-m֕ӃpD9.c\pcb.r\24E,mpRyX2r),!X,Ck-A&,Sx +OWdF"ԏw^Nnp:z٨y7A۠=`Mp +{d2_y ++{F =$*1 iRK1r~0Xl&K K.$YAU샛P>r,fjVSN棌1ϓά7(MHBK%B +ASy?Tn=Ǧ;_':r:EQ<5-a +C(BZkɤ-RvW'mWO?Q~؉O~+ȈN#? +0000000016 00000 n
+0000000159 00000 n
+0000016706 00000 n
+0000000000 00000 f
+0000063411 00000 n
+0000000000 00000 f
+0000016757 00000 n
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000063481 00000 n
+0000063512 00000 n
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000020437 00000 n
+0000063597 00000 n
+0000017158 00000 n
+0000017316 00000 n
+0000020870 00000 n
+0000020624 00000 n
+0000020747 00000 n
+0000018097 00000 n
+0000018739 00000 n
+0000019249 00000 n
+0000019733 00000 n
+0000017381 00000 n
+0000017536 00000 n
+0000017584 00000 n
+0000020375 00000 n
+0000020138 00000 n
+0000020313 00000 n
+0000020251 00000 n
+0000020076 00000 n
+0000020508 00000 n
+0000020539 00000 n
+0000020944 00000 n
+0000021127 00000 n
+0000022431 00000 n
+0000033714 00000 n
+0000050016 00000 n
+0000063622 00000 n
+trailer
<</Size 60/Root 1 0 R/Info 59 0 R/ID[<A9574215A3794EB69EDC5F2A9F73D83F><4EB2C399D71C4705888A21443A38AEB3>]>>
startxref
63763
%%EOF
\ No newline at end of file diff --git a/platform/macos/sdk/vi.lproj/Localizable.strings b/platform/macos/sdk/vi.lproj/Localizable.strings Binary files differindex 95e327d689..f130d2f350 100644 --- a/platform/macos/sdk/vi.lproj/Localizable.strings +++ b/platform/macos/sdk/vi.lproj/Localizable.strings diff --git a/platform/macos/src/MGLMapView.h b/platform/macos/src/MGLMapView.h index de099157c8..96b0932c14 100644 --- a/platform/macos/src/MGLMapView.h +++ b/platform/macos/src/MGLMapView.h @@ -396,12 +396,24 @@ MGL_EXPORT IB_DESIGNABLE Changing the value of this property updates the receiver immediately. If you want to animate the change, use the `-setVisibleCoordinateBounds:animated:` method instead. + + If a longitude is less than −180 degrees or greater than 180 degrees, the visible + bounds straddles the antimeridian or international date line. + + For example, a visible bounds that stretches from Tokyo to San Francisco would have + coordinates of (35.68476, -220.24257) and (37.78428, -122.41310). */ @property (nonatomic) MGLCoordinateBounds visibleCoordinateBounds; /** Changes the receiver’s viewport to fit the given coordinate bounds, optionally animating the change. + + To make the visible bounds go across the antimeridian or international date line, + specify some longitudes less than −180 degrees or greater than 180 degrees. + + For example, a visible bounds that stretches from Tokyo to San Francisco would have + coordinates of (35.68476, -220.24257) and (37.78428, -122.41310). @param bounds The bounds that the viewport will show in its entirety. @param animated Specify `YES` to animate the change by smoothly scrolling and diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index b32edffd43..9ec9012198 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -371,7 +371,7 @@ public: NSImage *logoImage = [[NSImage alloc] initWithContentsOfFile: [[NSBundle mgl_frameworkBundle] pathForResource:@"mapbox" ofType:@"pdf"]]; // Account for the image’s built-in padding when aligning other controls to the logo. - logoImage.alignmentRect = NSInsetRect(logoImage.alignmentRect, 0, 3); + logoImage.alignmentRect = NSOffsetRect(logoImage.alignmentRect, 0, 3); _logoView.image = logoImage; _logoView.translatesAutoresizingMaskIntoConstraints = NO; _logoView.accessibilityTitle = NSLocalizedStringWithDefaultValue(@"MAP_A11Y_TITLE", nil, nil, @"Mapbox", @"Accessibility title"); @@ -2077,7 +2077,7 @@ public: return true; } - if ([annotation isKindOfClass:[MGLShape class]]) + if ([annotation isKindOfClass:[MGLMultiPoint class]]) { return false; } |