Merge branch 'boundsj-merge-3.3.0.rc.1'
This commit is contained in:
Jesse Bounds
10
Makefile
10
Makefile
@@ -140,23 +140,23 @@ test-ios: ios
|
||||
-workspace $(IOS_WORK_PATH) -scheme CI test $(XCPRETTY)
|
||||
|
||||
ipackage: $(IOS_PROJ_PATH)
|
||||
BITCODE=$(BITCODE) FORMAT=$(FORMAT) BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=$(SYMBOLS) \
|
||||
FORMAT=$(FORMAT) BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=$(SYMBOLS) \
|
||||
./platform/ios/scripts/package.sh
|
||||
|
||||
ipackage-strip: $(IOS_PROJ_PATH)
|
||||
BITCODE=$(BITCODE) FORMAT=$(FORMAT) BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=NO \
|
||||
FORMAT=$(FORMAT) BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=NO \
|
||||
./platform/ios/scripts/package.sh
|
||||
|
||||
ipackage-sim: $(IOS_PROJ_PATH)
|
||||
BUILDTYPE=Debug BITCODE=$(BITCODE) FORMAT=dynamic BUILD_DEVICE=false SYMBOLS=$(SYMBOLS) \
|
||||
BUILDTYPE=Debug FORMAT=dynamic BUILD_DEVICE=false SYMBOLS=$(SYMBOLS) \
|
||||
./platform/ios/scripts/package.sh
|
||||
|
||||
iframework: $(IOS_PROJ_PATH)
|
||||
BITCODE=$(BITCODE) FORMAT=dynamic BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=$(SYMBOLS) \
|
||||
FORMAT=dynamic BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=$(SYMBOLS) \
|
||||
./platform/ios/scripts/package.sh
|
||||
|
||||
ifabric: $(IOS_PROJ_PATH)
|
||||
BITCODE=$(BITCODE) FORMAT=static BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=NO SELF_CONTAINED=YES \
|
||||
FORMAT=static BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=NO SELF_CONTAINED=YES \
|
||||
./platform/ios/scripts/package.sh
|
||||
|
||||
idocument:
|
||||
|
||||
12
include/mbgl/util/compression.hpp
Normal file
12
include/mbgl/util/compression.hpp
Normal file
@@ -0,0 +1,12 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace mbgl {
|
||||
namespace util {
|
||||
|
||||
std::string compress(const std::string& raw);
|
||||
std::string decompress(const std::string& raw);
|
||||
|
||||
} // namespace util
|
||||
} // namespace mbgl
|
||||
@@ -217,6 +217,7 @@
|
||||
'xcode_settings': {
|
||||
'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
|
||||
'OTHER_CFLAGS': [ '<@(cflags)' ],
|
||||
'BITCODE_GENERATION_MODE': 'bitcode',
|
||||
},
|
||||
}, {
|
||||
'cflags_cc': [ '<@(cflags_cc)' ],
|
||||
|
||||
88
platform/darwin/docs/theme/assets/css/highlight.css.scss
vendored
Normal file
88
platform/darwin/docs/theme/assets/css/highlight.css.scss
vendored
Normal file
@@ -0,0 +1,88 @@
|
||||
/* Rouge Syntax Highlighting, Mapbox Base style
|
||||
------------------------------------------------------- */
|
||||
.highlight .hll { background-color:#ffffcc }
|
||||
|
||||
/* No Styling, Just Default:
|
||||
.highlight .nx, Normal Text
|
||||
.highlight .ni Name.Entity
|
||||
.highlight .nf Name.Entity
|
||||
.highlight .no Name.Constant
|
||||
*/
|
||||
|
||||
/* Comments */
|
||||
.highlight .o, /* Operator */
|
||||
.highlight .c,
|
||||
.highlight .c1,
|
||||
.highlight .cp,
|
||||
.highlight .cm { color:#999; font-style:italic; }
|
||||
.highlight .err { color:#F00000; background-color:#F0A0A0 } /* Error */
|
||||
|
||||
.highlight .k { color:#404040; font-weight:bold; } /* Keyword */
|
||||
.highlight .css .k { font-weight:normal; }
|
||||
|
||||
.highlight .cs { color:#404040; font-style:italic; } /* Comment.Special */
|
||||
.highlight .gd { color:#A00000; } /* Generic.Deleted */
|
||||
.highlight .ge { font-style:italic } /* Generic.Emph */
|
||||
.highlight .gs { font-weight:bold; } /* Generic.Strong */
|
||||
.highlight .gr { color:#FF0000; } /* Generic.Error */
|
||||
.highlight .gh { color:#000080; } /* Generic.Heading */
|
||||
.highlight .gi { color:#00A000; } /* Generic.Inserted */
|
||||
.highlight .go { color:#808080; } /* Generic.Output */
|
||||
.highlight .gp { color:#c65d09; } /* Generic.Prompt */
|
||||
.highlight .gu { color:#800080; } /* Generic.Subheading */
|
||||
.highlight .gt { color:#0040D0; } /* Generic.Traceback */
|
||||
.highlight .kc { color:#D24400; } /* Keyword.Constant */
|
||||
|
||||
/* Keyword.Declaration
|
||||
* Keyword.Namespace
|
||||
* Keyword.Reserved */
|
||||
.highlight .kd,
|
||||
.highlight .kn,
|
||||
.highlight .kr,
|
||||
.highlight .nt { color:#0B5A91; } /* Name.Tag */
|
||||
|
||||
/* Literal.Number */
|
||||
.highlight .mh,
|
||||
.highlight .mo,
|
||||
.highlight .il,
|
||||
.highlight .mi,
|
||||
.highlight .kt,
|
||||
.highlight .mf,
|
||||
.highlight .nl, /* Name.Label */
|
||||
.highlight .na, /* Name.Attribute */
|
||||
.highlight .m { color:#0C9DC2; } /* Keyword.Type */
|
||||
.highlight .kp { color:#0080f0; } /* Keyword.Pseudo */
|
||||
|
||||
.highlight .nc { color:#DF6637; } /* Name.Class */
|
||||
.highlight .css .nc { color:#75A21C; }
|
||||
|
||||
.highlight .nd { color:#505050; } /* Name.Decorator */
|
||||
.highlight .ne { color:#F00000; } /* Name.Exception */
|
||||
|
||||
.highlight .nn { color:#0e84b5; } /* Name.Namespace */
|
||||
|
||||
.highlight .nf, /* Name.Function */
|
||||
.highlight .nv { color:#003060; } /* Name.Variable */
|
||||
.highlight .ow { color:#404040; } /* Operator.Word */
|
||||
.highlight .w { color:#bbbbbb; } /* Text.Whitespace */
|
||||
.highlight .sc { color:#8080F0; } /* Literal.String.Char */
|
||||
.highlight .sd { color:#D04020; } /* Literal.String.Doc */
|
||||
|
||||
/* Name.Builtin / Name.Builtin.Pseudo */
|
||||
.highlight .bp,
|
||||
.highlight .nb { color:#007020; }
|
||||
|
||||
/* Literal.String */
|
||||
.highlight .s,
|
||||
.highlight .sh,
|
||||
.highlight .sb,
|
||||
.highlight .s1,
|
||||
.highlight .sr,
|
||||
.highlight .se { color:#75A21C; }
|
||||
|
||||
.highlight .si { background-color:#eee; } /* Literal.String.Interpol */
|
||||
.highlight .p { color:#444444; } /* Normal Text */
|
||||
.highlight .ss { color:#f0c080; } /* Literal.String.Symbol */
|
||||
.highlight .vc { color:#c0c0f0; } /* Name.Variable.Class */
|
||||
.highlight .vg { color:#f08040; } /* Name.Variable.Global */
|
||||
.highlight .vi { color:#a0a0f0; } /* Name.Variable.Instance */
|
||||
600
platform/darwin/docs/theme/assets/css/jazzy.css.scss
vendored
Normal file
600
platform/darwin/docs/theme/assets/css/jazzy.css.scss
vendored
Normal file
@@ -0,0 +1,600 @@
|
||||
// ===========================================================================
|
||||
//
|
||||
// Variables
|
||||
//
|
||||
// ===========================================================================
|
||||
|
||||
$body_background: #fff;
|
||||
$body_font: 15px/25px 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
|
||||
$text_color: #333;
|
||||
$gray_border: 1px solid #ddd;
|
||||
|
||||
$quote_color: #858585;
|
||||
$quote_border: 4px solid #e5e5e5;
|
||||
|
||||
$link_color: #3887BE;
|
||||
$link_hover_color: #63b6e5;
|
||||
|
||||
$table_alt_row_color: #fbfbfb;
|
||||
$table_border_color: #ddd;
|
||||
|
||||
$code_bg_color: #f6f6f6;
|
||||
$code_font: Menlo, Bitstream Vera Sans Mono, Monaco, Consolas, monospacee;
|
||||
|
||||
|
||||
// ----- Layout
|
||||
|
||||
$gutter: 16px;
|
||||
$navigation_min_width: 175px;
|
||||
$navigation_max_width: 300px;
|
||||
|
||||
|
||||
// ----- Header
|
||||
|
||||
$header_weight: normal;
|
||||
$header_color: #555;
|
||||
$header_font: 'Open Sans Bold', 'Helvetica Neue', Helvetica, Arial, sans-serif;
|
||||
$header_bg_color: #3887be;
|
||||
$header_link_color: #fff;
|
||||
$doc_coverage_color: #999;
|
||||
|
||||
|
||||
// ----- Breadcrumbs
|
||||
|
||||
$breadcrumbs_bg_color: #fbfbfb;
|
||||
$breadcrumbs_border_color: #ddd;
|
||||
|
||||
|
||||
// ----- Navigation
|
||||
|
||||
$navigation_max_width: 300px;
|
||||
$navigation_bg_color: #fbfbfb;
|
||||
$navigation_border_color: #ddd;
|
||||
$navigation_title_color: rgba(0, 0, 0, 0.5);
|
||||
$navigation_task_color: $link_color;
|
||||
|
||||
$section_name_color: $navigation_title_color;
|
||||
|
||||
// ----- Content
|
||||
|
||||
$declaration_title_language_color: #4183c4;
|
||||
$declaration_language_border: 5px solid #cde9f4;
|
||||
$declaration_bg_color: #fdfeff;
|
||||
$declaration_border_color: #ddd;
|
||||
|
||||
$aside_color: #aaa;
|
||||
$aside_border: 5px solid lighten($aside_color, 20%);
|
||||
$aside_warning_color: #ff0000;
|
||||
$aside_warning_border: 5px solid lighten($aside_warning_color, 20%);
|
||||
|
||||
// ----- Footer
|
||||
|
||||
$footer_text_color: #888;
|
||||
$footer_link_color: #555;
|
||||
|
||||
|
||||
// ===========================================================================
|
||||
//
|
||||
// Base
|
||||
//
|
||||
// ===========================================================================
|
||||
|
||||
*, *:before, *:after {
|
||||
box-sizing: inherit;
|
||||
}
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
background: $body_background;
|
||||
color: $text_color;
|
||||
font: $body_font;
|
||||
letter-spacing: .2px;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
// ----- Block elements
|
||||
|
||||
@mixin heading($font-size: 1rem, $margin: 1.275em 0 0.85em) {
|
||||
font-family: $header_font;
|
||||
font-size: $font-size;
|
||||
font-weight: $header_weight;
|
||||
color: $header_color;
|
||||
margin: $margin;
|
||||
}
|
||||
|
||||
h1 {
|
||||
@include heading(2.0rem, 0.5em 0 0.6em);
|
||||
}
|
||||
|
||||
h1 a {
|
||||
color: $header_color;
|
||||
}
|
||||
|
||||
h2 {
|
||||
@include heading(1.5rem, 1em 0 0.6em);
|
||||
}
|
||||
|
||||
h3 {
|
||||
@include heading(1rem, 1em 0 0.3em);
|
||||
}
|
||||
|
||||
h4 {
|
||||
@include heading(1rem);
|
||||
}
|
||||
|
||||
h5, h6 {
|
||||
@include heading;
|
||||
}
|
||||
|
||||
p {
|
||||
margin: 0 0 1em;
|
||||
}
|
||||
|
||||
ul, ol {
|
||||
padding: 0 0 0 2em;
|
||||
margin: 0 0 0.85em;
|
||||
}
|
||||
|
||||
blockquote {
|
||||
margin: 0 0 0.85em;
|
||||
padding: 0 15px;
|
||||
color: $quote_color;
|
||||
border-left: $quote_border;
|
||||
}
|
||||
|
||||
|
||||
// ----- Inline elements
|
||||
|
||||
img {
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
a {
|
||||
color: $link_color;
|
||||
text-decoration: none;
|
||||
|
||||
&:hover, &:focus {
|
||||
color: $link_hover_color;
|
||||
}
|
||||
|
||||
&:focus {
|
||||
box-shadow:inset 0 0 0 1px rgba(0,0,0,0.05);
|
||||
}
|
||||
}
|
||||
|
||||
// ----- Tables
|
||||
|
||||
table {
|
||||
background: $body_background;
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
border-spacing: 0;
|
||||
overflow: auto;
|
||||
margin: 0 0 0.85em;
|
||||
}
|
||||
|
||||
tr {
|
||||
&:nth-child(2n) {
|
||||
background-color: $table_alt_row_color;
|
||||
}
|
||||
}
|
||||
|
||||
th, td {
|
||||
padding: 6px 13px;
|
||||
border: 1px solid $table_border_color;
|
||||
}
|
||||
|
||||
|
||||
// ----- Code
|
||||
|
||||
pre {
|
||||
margin: 0 0 1.275em;
|
||||
padding: .85em 1em;
|
||||
overflow: auto;
|
||||
background: $code_bg_color;
|
||||
font-family: $code_font;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
code {
|
||||
font-family: $code_font;
|
||||
font-size: .85em;
|
||||
line-height: .85em;
|
||||
}
|
||||
|
||||
p, li {
|
||||
> code {
|
||||
background: $code_bg_color;
|
||||
padding: .2em;
|
||||
border-radius: 4px;
|
||||
&:before, &:after {
|
||||
letter-spacing: -.35em;
|
||||
content: "\00a0";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pre code {
|
||||
padding: 0;
|
||||
white-space: pre;
|
||||
}
|
||||
|
||||
|
||||
// ===========================================================================
|
||||
//
|
||||
// Layout
|
||||
//
|
||||
// ===========================================================================
|
||||
|
||||
.content-wrapper {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@media (min-width: 768px) {
|
||||
flex-direction: row;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ===========================================================================
|
||||
//
|
||||
// Header
|
||||
//
|
||||
// ===========================================================================
|
||||
|
||||
.header {
|
||||
display: flex;
|
||||
padding: $gutter/2;
|
||||
font-size: 0.875em;
|
||||
background: $header_bg_color;
|
||||
color: $doc_coverage_color;
|
||||
}
|
||||
|
||||
.header-col {
|
||||
margin: 0;
|
||||
padding: 0 $gutter/2
|
||||
}
|
||||
|
||||
.header-col--primary {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.header-link {
|
||||
color: $header_link_color;
|
||||
}
|
||||
|
||||
.header-image, .header-icon {
|
||||
padding-right: 6px;
|
||||
vertical-align: -4px;
|
||||
height: 16px;
|
||||
}
|
||||
|
||||
// ===========================================================================
|
||||
//
|
||||
// Breadcrumbs
|
||||
//
|
||||
// ===========================================================================
|
||||
|
||||
.breadcrumbs {
|
||||
font-size: 0.875em;
|
||||
padding: $gutter / 2 $gutter;
|
||||
margin: 0;
|
||||
background: $breadcrumbs_bg_color;
|
||||
border-bottom: 1px solid $breadcrumbs_border_color;
|
||||
}
|
||||
|
||||
.carat {
|
||||
height: 10px;
|
||||
margin: 0 5px;
|
||||
}
|
||||
|
||||
|
||||
// ===========================================================================
|
||||
//
|
||||
// Navigation
|
||||
//
|
||||
// ===========================================================================
|
||||
|
||||
.navigation {
|
||||
order: 2;
|
||||
|
||||
@media (min-width: 768px) {
|
||||
order: 1;
|
||||
width: 25%;
|
||||
min-width: $navigation_min_width;
|
||||
max-width: $navigation_max_width;
|
||||
padding-bottom: $gutter*4;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
overflow: hidden;
|
||||
background: $navigation_bg_color;
|
||||
border-right: 1px solid $navigation_border_color;
|
||||
}
|
||||
}
|
||||
|
||||
.nav-groups {
|
||||
list-style-type: none;
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
.nav-group-name {
|
||||
border-bottom: 1px solid $navigation_border_color;
|
||||
padding: $gutter/2 0 $gutter/2 $gutter;
|
||||
}
|
||||
|
||||
.nav-group-name-link {
|
||||
font-family: $header_font;
|
||||
color: $navigation_title_color;
|
||||
}
|
||||
|
||||
.nav-group-tasks {
|
||||
margin: $gutter/2 0;
|
||||
padding: 0 0 0 $gutter/2;
|
||||
}
|
||||
|
||||
.nav-group-task {
|
||||
font-size: 1em;
|
||||
list-style-type: none;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
color: $navigation_task_color;
|
||||
}
|
||||
|
||||
.nav-group-task-link {
|
||||
color: $navigation_task_color;
|
||||
}
|
||||
|
||||
// ===========================================================================
|
||||
//
|
||||
// Content
|
||||
//
|
||||
// ===========================================================================
|
||||
|
||||
.main-content {
|
||||
order: 1;
|
||||
@media (min-width: 768px) {
|
||||
order: 2;
|
||||
flex: 1;
|
||||
padding-bottom: 60px;
|
||||
max-width: 80%;
|
||||
}
|
||||
}
|
||||
|
||||
.section {
|
||||
padding: 0 $gutter * 2;
|
||||
border-bottom: 1px solid $navigation_border_color;
|
||||
}
|
||||
|
||||
.section-content {
|
||||
margin: 0 auto;
|
||||
padding: $gutter 0;
|
||||
}
|
||||
|
||||
.section-content img {
|
||||
margin: 0 auto;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.section-name {
|
||||
color: $section_name_color;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.declaration .highlight {
|
||||
overflow-x: initial; // This allows the scrollbar to show up inside declarations
|
||||
padding: $gutter/2 0;
|
||||
margin: 0;
|
||||
background-color: transparent;
|
||||
border: none;
|
||||
}
|
||||
|
||||
.task-group-section {
|
||||
border-top: $gray_border;
|
||||
}
|
||||
|
||||
.task-group {
|
||||
padding-top: 0px;
|
||||
}
|
||||
|
||||
.task-name-container {
|
||||
a[name] {
|
||||
&:before {
|
||||
content: "";
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.item-container { }
|
||||
|
||||
.item {
|
||||
padding-top: 8px;
|
||||
width: 100%;
|
||||
list-style-type: none;
|
||||
|
||||
a[name] {
|
||||
&:before {
|
||||
content: "";
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
.token {
|
||||
padding-left: 3px;
|
||||
margin-left: 0px;
|
||||
font-size: 1em;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
.declaration-note {
|
||||
font-size: .85em;
|
||||
color: #808080;
|
||||
font-style: italic;
|
||||
}
|
||||
}
|
||||
|
||||
.pointer-container {
|
||||
border-bottom: $gray_border;
|
||||
left: -23px;
|
||||
padding-bottom: 13px;
|
||||
position: relative;
|
||||
width: 110%;
|
||||
}
|
||||
|
||||
.pointer {
|
||||
left: 21px;
|
||||
top: 7px;
|
||||
display: block;
|
||||
position: absolute;
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
border-left: 1px solid $declaration_border_color;
|
||||
border-top: 1px solid $declaration_border_color;
|
||||
background: $declaration_bg_color;
|
||||
transform: rotate(45deg);
|
||||
}
|
||||
|
||||
.height-container {
|
||||
display: none;
|
||||
position: relative;
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
.section {
|
||||
background: $declaration_bg_color;
|
||||
border: $gray_border;
|
||||
border-top-width: 0;
|
||||
padding: $gutter / 1.5 $gutter;
|
||||
}
|
||||
}
|
||||
|
||||
.aside, .language {
|
||||
padding: 6px 12px;
|
||||
margin: 12px 0;
|
||||
border-left: $aside_border;
|
||||
overflow-y: hidden;
|
||||
.aside-title {
|
||||
font-size: 9px;
|
||||
letter-spacing: 2px;
|
||||
text-transform: uppercase;
|
||||
padding-bottom: 0;
|
||||
margin: 0;
|
||||
color: $aside_color;
|
||||
-webkit-user-select: none;
|
||||
}
|
||||
p:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.language {
|
||||
border-left: $declaration_language_border;
|
||||
.aside-title {
|
||||
color: $declaration_title_language_color;
|
||||
}
|
||||
}
|
||||
|
||||
.aside-warning {
|
||||
border-left: $aside_warning_border;
|
||||
.aside-title {
|
||||
color: $aside_warning_color;
|
||||
}
|
||||
}
|
||||
|
||||
.graybox {
|
||||
border-collapse: collapse;
|
||||
width: 100%;
|
||||
p {
|
||||
margin: 0;
|
||||
word-break: break-word;
|
||||
min-width: 50px;
|
||||
}
|
||||
td {
|
||||
border: $gray_border;
|
||||
padding: 5px 25px 5px 10px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
tr td:first-of-type {
|
||||
text-align: right;
|
||||
padding: 7px;
|
||||
vertical-align: top;
|
||||
word-break: normal;
|
||||
width: 40px;
|
||||
}
|
||||
}
|
||||
|
||||
.slightly-smaller {
|
||||
font-size: 0.9em;
|
||||
}
|
||||
|
||||
.show-on-github {
|
||||
font-variant: small-caps;
|
||||
}
|
||||
|
||||
.show-on-github-icon {
|
||||
width: 16px;
|
||||
display: inline-block !important;
|
||||
vertical-align: -3px;
|
||||
padding-left: 2px;
|
||||
}
|
||||
|
||||
|
||||
// ===========================================================================
|
||||
//
|
||||
// Footer
|
||||
//
|
||||
// ===========================================================================
|
||||
|
||||
.footer {
|
||||
border-top: 1px $navigation_border_color solid;
|
||||
padding: $gutter/2 $gutter;
|
||||
color: $footer_text_color;
|
||||
font-size: 0.8em;
|
||||
|
||||
p {
|
||||
display: inline;
|
||||
}
|
||||
|
||||
a {
|
||||
color: $footer_link_color;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ===========================================================================
|
||||
//
|
||||
// Dash
|
||||
//
|
||||
// ===========================================================================
|
||||
|
||||
html.dash {
|
||||
|
||||
.header, .breadcrumbs, .navigation {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.height-container {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ===========================================================================
|
||||
//
|
||||
// Fonts
|
||||
//
|
||||
// ===========================================================================
|
||||
|
||||
@font-face {
|
||||
font-family:'Open Sans';
|
||||
src:url('../fonts/opensans-regular.eot');
|
||||
src:url('../fonts/opensans-regular.eot#iefix') format('embedded-opentype'),
|
||||
url('../fonts/opensans-regular.woff') format('woff');
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family:'Open Sans Bold';
|
||||
src:url('../fonts/opensans-bold.eot');
|
||||
src:url('../fonts/opensans-bold.eot#iefix') format('embedded-opentype'),
|
||||
url('../fonts/opensans-bold.woff') format('woff');
|
||||
}
|
||||
BIN
platform/darwin/docs/theme/assets/fonts/opensans-bold.eot
vendored
Executable file
BIN
platform/darwin/docs/theme/assets/fonts/opensans-bold.eot
vendored
Executable file
Binary file not shown.
BIN
platform/darwin/docs/theme/assets/fonts/opensans-bold.woff
vendored
Executable file
BIN
platform/darwin/docs/theme/assets/fonts/opensans-bold.woff
vendored
Executable file
Binary file not shown.
BIN
platform/darwin/docs/theme/assets/fonts/opensans-regular.eot
vendored
Executable file
BIN
platform/darwin/docs/theme/assets/fonts/opensans-regular.eot
vendored
Executable file
Binary file not shown.
BIN
platform/darwin/docs/theme/assets/fonts/opensans-regular.woff
vendored
Executable file
BIN
platform/darwin/docs/theme/assets/fonts/opensans-regular.woff
vendored
Executable file
Binary file not shown.
BIN
platform/darwin/docs/theme/assets/img/carat.png
vendored
Executable file
BIN
platform/darwin/docs/theme/assets/img/carat.png
vendored
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 274 B |
BIN
platform/darwin/docs/theme/assets/img/dash.png
vendored
Executable file
BIN
platform/darwin/docs/theme/assets/img/dash.png
vendored
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
4
platform/darwin/docs/theme/assets/img/github.svg
vendored
Normal file
4
platform/darwin/docs/theme/assets/img/github.svg
vendored
Normal file
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg viewBox="0 0 33 33" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<path stroke="none" fill="#555" fill-rule="evenodd" d="M16.6,0.4 C7.6,0.4 0.3,7.7 0.3,16.7 C0.3,23.9 5,30 11.4,32.2 C12.2,32.3 12.5,31.8 12.5,31.4 L12.5,28.6 C8,29.6 7,26.4 7,26.4 C6.3,24.5 5.2,24 5.2,24 C3.7,23 5.3,23 5.3,23 C6.9,23.1 7.8,24.7 7.8,24.7 C9.3,27.2 11.6,26.5 12.5,26.1 C12.6,25 13.1,24.3 13.5,23.9 C9.9,23.5 6.1,22.1 6.1,15.8 C6.1,14 6.7,12.6 7.8,11.4 C7.6,11 7.1,9.3 8,7.1 C8,7.1 9.4,6.7 12.5,8.8 C13.8,8.4 15.2,8.3 16.6,8.3 C18,8.3 19.4,8.5 20.7,8.8 C23.8,6.7 25.2,7.1 25.2,7.1 C26.1,9.3 25.5,11 25.4,11.4 C26.4,12.5 27.1,14 27.1,15.8 C27.1,22.1 23.3,23.4 19.7,23.8 C20.3,24.3 20.8,25.3 20.8,26.8 L20.8,31.3 C20.8,31.7 21.1,32.2 21.9,32.1 C28.4,29.9 33,23.8 33,16.6 C32.9,7.7 25.6,0.4 16.6,0.4 L16.6,0.4 Z"></path>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 916 B |
21
platform/darwin/docs/theme/assets/img/mapbox.svg
vendored
Normal file
21
platform/darwin/docs/theme/assets/img/mapbox.svg
vendored
Normal file
@@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg width="580px" height="156px" viewBox="0 0 580 156" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>layer1</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="mapbox" transform="translate(-1.000000, -1.000000)" fill="#FFFFFF">
|
||||
<g id="layer1" transform="translate(0.428470, 0.781010)">
|
||||
<g id="g3024" transform="translate(0.542850, 0.401720)">
|
||||
<path d="M0.028592,0.417258 L0.028592,122.817276 L18.028592,122.817276 L18.028592,22.017258 L54.028592,83.217258 L90.028592,22.017258 L90.028592,122.817276 L108.028592,122.817276 L108.028592,0.417258 L93.628592,0.417258 C86.428592,0.394218 80.77382,2.217258 77.597342,7.617258 L54.028592,47.667258 L30.459842,7.617258 C27.283364,2.217258 21.628592,0.394218 14.428592,0.417258 L0.028592,0.417258 L0.028592,0.417258 Z" id="path4479"></path>
|
||||
<path d="M315.028592,0.417258 L315.028592,124.617276 L349.228592,124.617276 C374.428592,124.617276 394.228592,104.81724 394.228592,77.817258 C394.228592,50.81724 374.428592,31.01724 349.228592,31.017258 C343.529972,31.041018 338.884892,30.824568 333.028592,30.848598 L333.028592,0.417348 L315.028592,0.417348 L315.028592,0.417258 Z M333.028592,49.017258 L349.228592,49.017258 C364.381892,49.017258 376.228592,62.677008 376.228592,77.817258 C376.228592,92.95632 365.621732,106.617258 349.228592,106.617258 L333.028592,106.617258 L333.028592,49.017258 L333.028592,49.017258 Z" id="path4477"></path>
|
||||
<path d="M165.628592,31.017258 C140.428592,31.017258 122.428592,50.817258 122.428592,77.817258 C122.428592,104.817258 140.428574,124.617276 165.628592,124.617276 L208.828592,124.617276 L208.828592,77.817258 C208.828592,50.817258 190.82861,31.017258 165.628592,31.017258 L165.628592,31.017258 Z M165.628592,49.017258 C180.028592,49.017258 190.828592,61.424226 190.828592,77.817258 L190.828592,106.617258 L165.628592,106.617258 C151.228574,106.617258 140.428628,93.994254 140.428592,77.817258 C140.428574,61.617258 151.228592,49.017258 165.628592,49.017258 L165.628592,49.017258 Z" id="path4475"></path>
|
||||
<path d="M223.228592,31.017258 L223.228592,155.217276 L241.228592,155.217276 L241.228592,124.729776 C247.084856,124.753536 251.729954,124.593516 257.428592,124.617276 C282.628592,124.617276 302.428592,104.817258 302.428592,77.817258 C302.428592,50.817258 282.628592,31.017258 257.428592,31.017258 L223.228592,31.017258 L223.228592,31.017258 Z M241.228592,49.017258 L257.428592,49.017258 C273.821552,49.017258 284.428592,62.678196 284.428592,77.817258 C284.428592,92.957508 272.581892,106.617258 257.428592,106.617258 L241.228592,106.617258 L241.228592,49.017258 L241.228592,49.017258 Z" id="path4473"></path>
|
||||
<path d="M450.028592,31.017258 C425.175812,31.017258 405.028592,51.970374 405.028592,77.817258 C405.028592,103.664142 425.175812,124.617276 450.028592,124.617276 C474.881372,124.617276 495.028592,103.664142 495.028592,77.817258 C495.028592,51.970374 474.881372,31.017258 450.028592,31.017258 L450.028592,31.017258 Z M450.028592,49.017258 C464.940332,49.017258 477.028592,61.911522 477.028592,77.817258 C477.028592,93.722994 464.940332,106.617258 450.028592,106.617258 C435.116852,106.617258 423.028592,93.722994 423.028592,77.817258 C423.028592,61.911522 435.116852,49.017258 450.028592,49.017258 L450.028592,49.017258 Z" id="path4471"></path>
|
||||
<polygon id="path4469" points="493.116092 32.794182 524.447342 76.444182 491.428592 122.7942 513.478592 122.7942 535.472342 91.856682 557.578592 122.7942 579.628592 122.7942 546.553592 76.444182 577.828592 32.794182 555.666092 32.794182 535.472342 60.975432 515.278592 32.794218"></polygon>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 4.0 KiB |
40
platform/darwin/docs/theme/assets/js/jazzy.js
vendored
Executable file
40
platform/darwin/docs/theme/assets/js/jazzy.js
vendored
Executable file
@@ -0,0 +1,40 @@
|
||||
window.jazzy = {'docset': false}
|
||||
if (typeof window.dash != 'undefined') {
|
||||
document.documentElement.className += ' dash'
|
||||
window.jazzy.docset = true
|
||||
}
|
||||
if (navigator.userAgent.match(/xcode/i)) {
|
||||
document.documentElement.className += ' xcode'
|
||||
window.jazzy.docset = true
|
||||
}
|
||||
|
||||
// On doc load, toggle the URL hash discussion if present
|
||||
$(document).ready(function() {
|
||||
if (!window.jazzy.docset) {
|
||||
var linkToHash = $('a[href="' + window.location.hash +'"]');
|
||||
linkToHash.trigger("click");
|
||||
}
|
||||
});
|
||||
|
||||
// On token click, toggle its discussion and animate token.marginLeft
|
||||
$(".token").click(function(event) {
|
||||
if (window.jazzy.docset) {
|
||||
return;
|
||||
}
|
||||
var link = $(this);
|
||||
var animationDuration = 300;
|
||||
var tokenOffset = "-15px";
|
||||
var original = link.css('marginLeft') == tokenOffset;
|
||||
link.animate({'margin-left':original ? "0px" : tokenOffset}, animationDuration);
|
||||
$content = link.parent().parent().next();
|
||||
$content.slideToggle(animationDuration);
|
||||
|
||||
// Keeps the document from jumping to the hash.
|
||||
var href = $(this).attr('href');
|
||||
if (history.pushState) {
|
||||
history.pushState({}, '', href);
|
||||
} else {
|
||||
location.hash = href;
|
||||
}
|
||||
event.preventDefault();
|
||||
});
|
||||
4
platform/darwin/docs/theme/assets/js/jquery.min.js
vendored
Executable file
4
platform/darwin/docs/theme/assets/js/jquery.min.js
vendored
Executable file
File diff suppressed because one or more lines are too long
53
platform/darwin/docs/theme/templates/doc.mustache
vendored
Normal file
53
platform/darwin/docs/theme/templates/doc.mustache
vendored
Normal file
@@ -0,0 +1,53 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>{{name}} {{kind}} Reference</title>
|
||||
<link rel="stylesheet" type="text/css" href="{{path_to_root}}css/jazzy.css" />
|
||||
<link rel="stylesheet" type="text/css" href="{{path_to_root}}css/highlight.css" />
|
||||
<meta charset="utf-8">
|
||||
<script src="{{path_to_root}}js/jquery.min.js" defer></script>
|
||||
<script src="{{path_to_root}}js/jazzy.js" defer></script>
|
||||
{{{custom_head}}}
|
||||
</head>
|
||||
<body>
|
||||
|
||||
{{#dash_type}}
|
||||
<a name="//apple_ref/{{language_stub}}/{{dash_type}}/{{name}}" class="dashAnchor"></a>
|
||||
{{/dash_type}}
|
||||
|
||||
<a title="{{name}} {{kind}} Reference"></a>
|
||||
|
||||
{{> header}}
|
||||
|
||||
<p class="breadcrumbs">
|
||||
<a class="breadcrumb" href="{{path_to_root}}index.html">{{module_name}} Reference</a>
|
||||
<img class="carat" src="{{path_to_root}}img/carat.png" />
|
||||
{{name}} {{kind}} Reference
|
||||
</p>
|
||||
|
||||
<div class="content-wrapper">
|
||||
{{> nav}}
|
||||
<article class="main-content">
|
||||
|
||||
<section class="section">
|
||||
<div class="section-content">
|
||||
{{^hide_name}}<h1>{{name}}</h1>{{/hide_name}}
|
||||
{{#declaration}}
|
||||
<div class="declaration">
|
||||
<div class="language">
|
||||
{{{declaration}}}
|
||||
</div>
|
||||
</div>
|
||||
{{/declaration}}
|
||||
{{{overview}}}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{{> tasks}}
|
||||
|
||||
</article>
|
||||
</div>
|
||||
{{> footer}}
|
||||
</body>
|
||||
</div>
|
||||
</html>
|
||||
3
platform/darwin/docs/theme/templates/footer.mustache
vendored
Normal file
3
platform/darwin/docs/theme/templates/footer.mustache
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
<section class="footer">
|
||||
{{{copyright}}} Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v{{jazzy_version}}</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.
|
||||
</section>
|
||||
28
platform/darwin/docs/theme/templates/header.mustache
vendored
Normal file
28
platform/darwin/docs/theme/templates/header.mustache
vendored
Normal file
@@ -0,0 +1,28 @@
|
||||
<header class="header">
|
||||
<p class="header-col header-col--primary">
|
||||
<a class="header-link" href="{{path_to_root}}index.html">
|
||||
<img class="header-icon" src="{{path_to_root}}img/mapbox.svg" alt="{{module_name}} Docs"/>
|
||||
</a>
|
||||
{{#doc_coverage}} ({{doc_coverage}}% documented){{/doc_coverage}}
|
||||
</p>
|
||||
|
||||
{{#github_url}}
|
||||
<p class="header-col header-col--secondary">
|
||||
<a class="header-link" href="{{github_url}}">
|
||||
<svg class="header-icon" viewBox="0 0 33 33" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<path stroke="none" stroke-width="1" fill="white" fill-rule="evenodd" d="M16.6,0.4 C7.6,0.4 0.3,7.7 0.3,16.7 C0.3,23.9 5,30 11.4,32.2 C12.2,32.3 12.5,31.8 12.5,31.4 L12.5,28.6 C8,29.6 7,26.4 7,26.4 C6.3,24.5 5.2,24 5.2,24 C3.7,23 5.3,23 5.3,23 C6.9,23.1 7.8,24.7 7.8,24.7 C9.3,27.2 11.6,26.5 12.5,26.1 C12.6,25 13.1,24.3 13.5,23.9 C9.9,23.5 6.1,22.1 6.1,15.8 C6.1,14 6.7,12.6 7.8,11.4 C7.6,11 7.1,9.3 8,7.1 C8,7.1 9.4,6.7 12.5,8.8 C13.8,8.4 15.2,8.3 16.6,8.3 C18,8.3 19.4,8.5 20.7,8.8 C23.8,6.7 25.2,7.1 25.2,7.1 C26.1,9.3 25.5,11 25.4,11.4 C26.4,12.5 27.1,14 27.1,15.8 C27.1,22.1 23.3,23.4 19.7,23.8 C20.3,24.3 20.8,25.3 20.8,26.8 L20.8,31.3 C20.8,31.7 21.1,32.2 21.9,32.1 C28.4,29.9 33,23.8 33,16.6 C32.9,7.7 25.6,0.4 16.6,0.4 L16.6,0.4 Z"></path>
|
||||
</svg>
|
||||
View on GitHub
|
||||
</a>
|
||||
</p>
|
||||
{{/github_url}}
|
||||
|
||||
{{#dash_url}}
|
||||
<p class="header-col header-col--secondary">
|
||||
<a class="header-link" href="{{dash_url}}">
|
||||
<img class="header-icon" src="{{path_to_root}}img/dash.png"/>
|
||||
Install in Dash
|
||||
</a>
|
||||
</p>
|
||||
{{/dash_url}}
|
||||
</header>
|
||||
16
platform/darwin/docs/theme/templates/nav.mustache
vendored
Normal file
16
platform/darwin/docs/theme/templates/nav.mustache
vendored
Normal file
@@ -0,0 +1,16 @@
|
||||
<nav class="navigation">
|
||||
<ul class="nav-groups">
|
||||
{{#structure}}
|
||||
<li class="nav-group-name">
|
||||
<a class="nav-group-name-link" href="{{path_to_root}}{{section}}.html">{{section}}</a>
|
||||
<ul class="nav-group-tasks">
|
||||
{{#children}}
|
||||
<li class="nav-group-task">
|
||||
<a class="nav-group-task-link" href="{{path_to_root}}{{url}}">{{name}}</a>
|
||||
</li>
|
||||
{{/children}}
|
||||
</ul>
|
||||
</li>
|
||||
{{/structure}}
|
||||
</ul>
|
||||
</nav>
|
||||
12
platform/darwin/docs/theme/templates/parameter.mustache
vendored
Normal file
12
platform/darwin/docs/theme/templates/parameter.mustache
vendored
Normal file
@@ -0,0 +1,12 @@
|
||||
<tr>
|
||||
<td>
|
||||
<code>
|
||||
<em>{{name}}</em>
|
||||
</code>
|
||||
</td>
|
||||
<td>
|
||||
<div>
|
||||
{{{discussion}}}
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
95
platform/darwin/docs/theme/templates/task.mustache
vendored
Normal file
95
platform/darwin/docs/theme/templates/task.mustache
vendored
Normal file
@@ -0,0 +1,95 @@
|
||||
<div class="task-group">
|
||||
{{#name}}
|
||||
<div class="task-name-container">
|
||||
<a name="/{{uid}}"></a>
|
||||
<a name="//apple_ref/{{language_stub}}/Section/{{name}}" class="dashAnchor"></a>
|
||||
<a href="#/{{uid}}">
|
||||
<h3 class="section-name">{{name}}</h3>
|
||||
</a>
|
||||
</div>
|
||||
{{/name}}
|
||||
<ul class="item-container">
|
||||
{{#items}}
|
||||
<li class="item">
|
||||
<div>
|
||||
<code>
|
||||
<a name="/{{usr}}"></a>
|
||||
<a name="//apple_ref/{{language_stub}}/{{dash_type}}/{{name}}" class="dashAnchor"></a>
|
||||
<a class="token" href="#/{{usr}}">{{name}}</a>
|
||||
</code>
|
||||
{{#default_impl_abstract}}
|
||||
<span class="declaration-note">
|
||||
Default implementation
|
||||
</span>
|
||||
{{/default_impl_abstract}}
|
||||
{{#from_protocol_extension}}
|
||||
<span class="declaration-note">
|
||||
Extension method
|
||||
</span>
|
||||
{{/from_protocol_extension}}
|
||||
</div>
|
||||
<div class="height-container">
|
||||
<div class="pointer-container"></div>
|
||||
<section class="section">
|
||||
<div class="pointer"></div>
|
||||
{{#abstract}}
|
||||
<div class="abstract">
|
||||
{{{abstract}}}
|
||||
{{#url}}
|
||||
<a href="{{{path_to_root}}}{{{url}}}" class="slightly-smaller">See more</a>
|
||||
{{/url}}
|
||||
</div>
|
||||
{{/abstract}}
|
||||
{{#default_impl_abstract}}
|
||||
<h4>Default Implementation</h4>
|
||||
<div class="default_impl abstract">
|
||||
{{{default_impl_abstract}}}
|
||||
</div>
|
||||
{{/default_impl_abstract}}
|
||||
{{#declaration}}
|
||||
<div class="declaration">
|
||||
<h4>Declaration</h4>
|
||||
<div class="language">
|
||||
<p class="aside-title">{{language}}</p>
|
||||
{{{declaration}}}
|
||||
</div>
|
||||
{{#other_language_declaration}}
|
||||
<div class="language">
|
||||
<p class="aside-title">Swift</p>
|
||||
{{{other_language_declaration}}}
|
||||
</div>
|
||||
{{/other_language_declaration}}
|
||||
</div>
|
||||
{{/declaration}}
|
||||
{{#parameters.count}}
|
||||
<div>
|
||||
<h4>Parameters</h4>
|
||||
<table class="graybox">
|
||||
<tbody>
|
||||
{{#parameters}}
|
||||
{{> parameter}}
|
||||
{{/parameters}}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{{/parameters.count}}
|
||||
{{#return}}
|
||||
<div>
|
||||
<h4>Return Value</h4>
|
||||
{{{return}}}
|
||||
</div>
|
||||
{{/return}}
|
||||
{{#github_token_url}}
|
||||
<div class="slightly-smaller show-on-github">
|
||||
<a href="{{{github_token_url}}}">
|
||||
show on github
|
||||
<img class="show-on-github-icon" src="{{{path_to_root}}}img/github.svg"/>
|
||||
</a>
|
||||
</div>
|
||||
{{/github_token_url}}
|
||||
</section>
|
||||
</div>
|
||||
</li>
|
||||
{{/items}}
|
||||
</ul>
|
||||
</div>
|
||||
9
platform/darwin/docs/theme/templates/tasks.mustache
vendored
Normal file
9
platform/darwin/docs/theme/templates/tasks.mustache
vendored
Normal file
@@ -0,0 +1,9 @@
|
||||
{{#tasks.count}}
|
||||
<section class="section">
|
||||
<div class="section-content">
|
||||
{{#tasks}}
|
||||
{{> task}}
|
||||
{{/tasks}}
|
||||
</div>
|
||||
</section>
|
||||
{{/tasks.count}}
|
||||
@@ -40,58 +40,92 @@ NSString * const MGLOfflinePackMaximumCountUserInfoKey = @"MaximumCount";
|
||||
return sharedOfflineStorage;
|
||||
}
|
||||
|
||||
- (instancetype)init {
|
||||
if (self = [super init]) {
|
||||
// Place the cache in a location specific to the application, so that
|
||||
// packs downloaded by other applications don’t count toward this
|
||||
// application’s limits.
|
||||
// ~/Library/Application Support/tld.app.bundle.id/cache.db
|
||||
NSURL *cacheDirectoryURL = [[NSFileManager defaultManager] URLForDirectory:NSApplicationSupportDirectory
|
||||
inDomain:NSUserDomainMask
|
||||
appropriateForURL:nil
|
||||
create:YES
|
||||
error:nil];
|
||||
NSString *bundleIdentifier = [NSBundle mainBundle].bundleIdentifier;
|
||||
if (!bundleIdentifier) {
|
||||
// There’s no main bundle identifier when running in a unit test bundle.
|
||||
bundleIdentifier = [NSBundle bundleForClass:[self class]].bundleIdentifier;
|
||||
}
|
||||
cacheDirectoryURL = [cacheDirectoryURL URLByAppendingPathComponent:bundleIdentifier];
|
||||
[[NSFileManager defaultManager] createDirectoryAtURL:cacheDirectoryURL
|
||||
withIntermediateDirectories:YES
|
||||
attributes:nil
|
||||
error:nil];
|
||||
NSURL *cacheURL = [cacheDirectoryURL URLByAppendingPathComponent:MGLOfflineStorageFileName];
|
||||
NSString *cachePath = cacheURL ? cacheURL.path : @"";
|
||||
|
||||
// Move the offline cache from v3.2.0-beta.1 to a location that can also
|
||||
// be used for ambient caching.
|
||||
#if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR
|
||||
// ~/Documents/offline.db
|
||||
NSArray *legacyPaths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
|
||||
NSString *legacyCachePath = [legacyPaths.firstObject stringByAppendingPathComponent:MGLOfflineStorageFileName3_2_0_beta_1];
|
||||
#elif TARGET_OS_MAC
|
||||
// ~/Library/Caches/tld.app.bundle.id/offline.db
|
||||
NSURL *legacyCacheDirectoryURL = [[NSFileManager defaultManager] URLForDirectory:NSCachesDirectory
|
||||
inDomain:NSUserDomainMask
|
||||
appropriateForURL:nil
|
||||
create:NO
|
||||
error:nil];
|
||||
legacyCacheDirectoryURL = [legacyCacheDirectoryURL URLByAppendingPathComponent:bundleIdentifier];
|
||||
NSURL *legacyCacheURL = [legacyCacheDirectoryURL URLByAppendingPathComponent:MGLOfflineStorageFileName3_2_0_beta_1];
|
||||
NSString *legacyCachePath = legacyCacheURL ? legacyCacheURL.path : @"";
|
||||
#endif
|
||||
if (![[NSFileManager defaultManager] fileExistsAtPath:cachePath]) {
|
||||
[[NSFileManager defaultManager] moveItemAtPath:legacyCachePath toPath:cachePath error:NULL];
|
||||
}
|
||||
|
||||
_mbglFileSource = new mbgl::DefaultFileSource(cachePath.UTF8String, [NSBundle mainBundle].resourceURL.path.UTF8String);
|
||||
/**
|
||||
Returns the file URL to the offline cache, with the option to omit the private
|
||||
subdirectory for legacy (v3.2.0 - v3.2.3) migration purposes.
|
||||
|
||||
The cache is located in a directory specific to the application, so that packs
|
||||
downloaded by other applications don’t count toward this application’s limits.
|
||||
|
||||
The cache is located at:
|
||||
~/Library/Application Support/tld.app.bundle.id/.mapbox/cache.db
|
||||
|
||||
The subdirectory-less cache was located at:
|
||||
~/Library/Application Support/tld.app.bundle.id/cache.db
|
||||
*/
|
||||
+ (NSURL *)cacheURLIncludingSubdirectory:(BOOL)useSubdirectory {
|
||||
NSURL *cacheDirectoryURL = [[NSFileManager defaultManager] URLForDirectory:NSApplicationSupportDirectory
|
||||
inDomain:NSUserDomainMask
|
||||
appropriateForURL:nil
|
||||
create:YES
|
||||
error:nil];
|
||||
NSString *bundleIdentifier = [NSBundle mainBundle].bundleIdentifier;
|
||||
if (!bundleIdentifier) {
|
||||
// There’s no main bundle identifier when running in a unit test bundle.
|
||||
bundleIdentifier = [NSBundle bundleForClass:self].bundleIdentifier;
|
||||
}
|
||||
cacheDirectoryURL = [cacheDirectoryURL URLByAppendingPathComponent:bundleIdentifier];
|
||||
if (useSubdirectory) {
|
||||
cacheDirectoryURL = [cacheDirectoryURL URLByAppendingPathComponent:@".mapbox"];
|
||||
}
|
||||
[[NSFileManager defaultManager] createDirectoryAtURL:cacheDirectoryURL
|
||||
withIntermediateDirectories:YES
|
||||
attributes:nil
|
||||
error:nil];
|
||||
if (useSubdirectory) {
|
||||
// Avoid backing up the offline cache onto iCloud, because it can be
|
||||
// redownloaded. Ideally, we’d even put the ambient cache in Caches, so
|
||||
// it can be reclaimed by the system when disk space runs low. But
|
||||
// unfortunately it has to live in the same file as offline resources.
|
||||
[cacheURL setResourceValue:@YES forKey:NSURLIsExcludedFromBackupKey error:NULL];
|
||||
[cacheDirectoryURL setResourceValue:@YES forKey:NSURLIsExcludedFromBackupKey error:NULL];
|
||||
}
|
||||
return [cacheDirectoryURL URLByAppendingPathComponent:MGLOfflineStorageFileName];
|
||||
}
|
||||
|
||||
/**
|
||||
Returns the absolute path to the location where v3.2.0-beta.1 placed the
|
||||
offline cache.
|
||||
*/
|
||||
+ (NSString *)legacyCachePath {
|
||||
#if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR
|
||||
// ~/Documents/offline.db
|
||||
NSArray *legacyPaths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
|
||||
NSString *legacyCachePath = [legacyPaths.firstObject stringByAppendingPathComponent:MGLOfflineStorageFileName3_2_0_beta_1];
|
||||
#elif TARGET_OS_MAC
|
||||
// ~/Library/Caches/tld.app.bundle.id/offline.db
|
||||
NSString *bundleIdentifier = [NSBundle mainBundle].bundleIdentifier;
|
||||
NSURL *legacyCacheDirectoryURL = [[NSFileManager defaultManager] URLForDirectory:NSCachesDirectory
|
||||
inDomain:NSUserDomainMask
|
||||
appropriateForURL:nil
|
||||
create:NO
|
||||
error:nil];
|
||||
legacyCacheDirectoryURL = [legacyCacheDirectoryURL URLByAppendingPathComponent:bundleIdentifier];
|
||||
NSURL *legacyCacheURL = [legacyCacheDirectoryURL URLByAppendingPathComponent:MGLOfflineStorageFileName3_2_0_beta_1];
|
||||
NSString *legacyCachePath = legacyCacheURL ? legacyCacheURL.path : @"";
|
||||
#endif
|
||||
return legacyCachePath;
|
||||
}
|
||||
|
||||
- (instancetype)init {
|
||||
if (self = [super init]) {
|
||||
NSURL *cacheURL = [[self class] cacheURLIncludingSubdirectory:YES];
|
||||
NSString *cachePath = cacheURL.path ?: @"";
|
||||
|
||||
// Move the offline cache from v3.2.0-beta.1 to a location that can also
|
||||
// be used for ambient caching.
|
||||
if (![[NSFileManager defaultManager] fileExistsAtPath:cachePath]) {
|
||||
NSString *legacyCachePath = [[self class] legacyCachePath];
|
||||
[[NSFileManager defaultManager] moveItemAtPath:legacyCachePath toPath:cachePath error:NULL];
|
||||
}
|
||||
|
||||
// Move the offline file cache from v3.2.x path to a subdirectory that
|
||||
// can be reliably excluded from backups.
|
||||
if (![[NSFileManager defaultManager] fileExistsAtPath:cachePath]) {
|
||||
NSURL *subdirectorylessCacheURL = [[self class] cacheURLIncludingSubdirectory:NO];
|
||||
[[NSFileManager defaultManager] moveItemAtPath:subdirectorylessCacheURL.path toPath:cachePath error:NULL];
|
||||
}
|
||||
|
||||
_mbglFileSource = new mbgl::DefaultFileSource(cachePath.UTF8String, [NSBundle mainBundle].resourceURL.path.UTF8String);
|
||||
|
||||
// Observe for changes to the global access token (and find out the current one).
|
||||
[[MGLAccountManager sharedManager] addObserver:self
|
||||
|
||||
15
platform/darwin/src/NSData+MGLAdditions.h
Normal file
15
platform/darwin/src/NSData+MGLAdditions.h
Normal file
@@ -0,0 +1,15 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
#import "MGLTypes.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface NSData (MGLAdditions)
|
||||
|
||||
- (NSData *)mgl_compressedData;
|
||||
|
||||
- (NSData *)mgl_decompressedData;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
23
platform/darwin/src/NSData+MGLAdditions.mm
Normal file
23
platform/darwin/src/NSData+MGLAdditions.mm
Normal file
@@ -0,0 +1,23 @@
|
||||
#import "NSData+MGLAdditions.h"
|
||||
|
||||
#include <mbgl/util/compression.hpp>
|
||||
|
||||
@implementation NSData (MGLAdditions)
|
||||
|
||||
- (NSData *)mgl_compressedData
|
||||
{
|
||||
std::string string(static_cast<const char*>(self.bytes), self.length);
|
||||
std::string compressed_string = mbgl::util::compress(string);
|
||||
|
||||
return [NSData dataWithBytes:&compressed_string[0] length:compressed_string.length()];
|
||||
}
|
||||
|
||||
- (NSData *)mgl_decompressedData
|
||||
{
|
||||
std::string string(static_cast<const char*>(self.bytes), self.length);
|
||||
std::string decompressed_string = mbgl::util::decompress(string);
|
||||
|
||||
return [NSData dataWithBytes:&decompressed_string[0] length:decompressed_string.length()];
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -25,7 +25,7 @@ public:
|
||||
perform
|
||||
};
|
||||
source = CFRunLoopSourceCreate(kCFAllocatorDefault, 0, &context);
|
||||
CFRunLoopAddSource(loop, source, kCFRunLoopDefaultMode);
|
||||
CFRunLoopAddSource(loop, source, kCFRunLoopCommonModes);
|
||||
}
|
||||
|
||||
~Impl() {
|
||||
|
||||
@@ -106,17 +106,18 @@
|
||||
// Unit tests don't use the main bundle; use com.mapbox.ios.sdk instead.
|
||||
NSString *bundleIdentifier = [NSBundle bundleForClass:[MGLMapView class]].bundleIdentifier;
|
||||
cacheDirectoryURL = [cacheDirectoryURL URLByAppendingPathComponent:bundleIdentifier];
|
||||
XCTAssertTrue([[NSFileManager defaultManager] fileExistsAtPath:cacheDirectoryURL.path], @"Cache directory should exist.");
|
||||
cacheDirectoryURL = [cacheDirectoryURL URLByAppendingPathComponent:@".mapbox"];
|
||||
XCTAssertTrue([[NSFileManager defaultManager] fileExistsAtPath:cacheDirectoryURL.path], @"Cache subdirectory should exist.");
|
||||
|
||||
NSURL *cacheURL = [cacheDirectoryURL URLByAppendingPathComponent:@"cache.db"];
|
||||
XCTAssertTrue([[NSFileManager defaultManager] fileExistsAtPath:cacheURL.path], @"Cache database should exist.");
|
||||
|
||||
NSError *error = nil;
|
||||
NSNumber *exclusionFlag = nil;
|
||||
[cacheURL getResourceValue:&exclusionFlag
|
||||
forKey:NSURLIsExcludedFromBackupKey
|
||||
error:&error];
|
||||
XCTAssertTrue(exclusionFlag && [exclusionFlag boolValue], @"Backup exclusion flag should be set for cache database.");
|
||||
[cacheDirectoryURL getResourceValue:&exclusionFlag
|
||||
forKey:NSURLIsExcludedFromBackupKey
|
||||
error:&error];
|
||||
XCTAssertTrue(exclusionFlag && [exclusionFlag boolValue], @"Backup exclusion flag should be set for the directory containing the cache database.");
|
||||
XCTAssertNil(error, @"No errors should be returned when checking backup exclusion flag.");
|
||||
}
|
||||
|
||||
|
||||
@@ -6,37 +6,59 @@ Mapbox welcomes participation and contributions from everyone. Please read [CON
|
||||
|
||||
## 3.3.0
|
||||
|
||||
- Applications linking against the SDK static framework no longer need to add `-ObjC` to the Other Linker Flags (`OTHER_LDFLAGS`) build setting. If you previously added this flag solely for this SDK, removing the flag may potentially reduce the overall size of your application. ([#4641](https://github.com/mapbox/mapbox-gl-native/pull/4641))
|
||||
- Removed the `armv7s` slice from the SDK to reduce its size. iPhone 5 and iPhone 5c automatically use the `armv7` slice instead. ([#4641](https://github.com/mapbox/mapbox-gl-native/pull/4641))
|
||||
- MGLPointAnnotation and custom MGLAnnotation implementations (but not MGLMultiPoint) can be backed by an MGLAnnotationView instead of an MGLAnnotationImage. MGLAnnotationView is a subclass of UIView, so you can use Core Animation and other familiar technologies with it. To associate an MGLAnnotation with an MGLAnnotationView, implement `-mapView:viewForAnnotation:` in your MGLMapViewDelegate class. ([#4801](https://github.com/mapbox/mapbox-gl-native/pull/4801))
|
||||
- The user dot now moves smoothly between user location updates while user location tracking is disabled. ([#1582](https://github.com/mapbox/mapbox-gl-native/pull/1582))
|
||||
- An MGLAnnotation can be relocated by changing its `coordinate` property in a KVO-compliant way. An MGLMultiPoint cannot be relocated. ([#3835](https://github.com/mapbox/mapbox-gl-native/pull/3835))
|
||||
- Setting the `image` property of an MGLAnnotationImage to `nil` resets it to the default red pin image and reclaims resources that can be used to customize additional annotations. ([#3835](https://github.com/mapbox/mapbox-gl-native/pull/3835))
|
||||
### Styles and data
|
||||
|
||||
- Added methods to MGLMapView for obtaining the underlying map data rendered by the current style, along with additional classes to represent complex geometry in that data. ([#5110](https://github.com/mapbox/mapbox-gl-native/pull/5110))
|
||||
- An MGLPolygon can now have interior polygons, representing holes knocked out of the overall shape. ([#5110](https://github.com/mapbox/mapbox-gl-native/pull/5110))
|
||||
- `MGLOfflinePackProgress` now indicates how many tiles have been downloaded and how much space they take up. ([#4874](https://github.com/mapbox/mapbox-gl-native/pull/4874))
|
||||
- The compass, user dot, and visible annotations are now accessible to VoiceOver users. ([#1496](https://github.com/mapbox/mapbox-gl-native/pull/1496))
|
||||
- Added a method to MGLMapView, `-anchorPointForGesture:`, that you can override to anchor gestures at a point other than the user location. ([#5302](https://github.com/mapbox/mapbox-gl-native/pull/5302))
|
||||
- Fixed an issue (speculatively) where the tile cache could be included in iCloud backups. ([#5124](https://github.com/mapbox/mapbox-gl-native/pull/5124))
|
||||
- Improved performance viewing regions with large landcover polygons when viewing a style that uses the Mapbox Streets source. ([#2444](https://github.com/mapbox/mapbox-gl-native/pull/2444))
|
||||
- Fixed a memory leak when using raster resources. ([#5141](https://github.com/mapbox/mapbox-gl-native/pull/5141))
|
||||
- The SDK is now localizable. No localizations are currently provided, other than English, but if you need a particular localization, you can install the SDK manually and drop a .lproj folder into the framework. ([#4783](https://github.com/mapbox/mapbox-gl-native/pull/4783))
|
||||
- Fixed an issue preventing KVO change notifications from being generated on MGLMapView’s `userTrackingMode` key path when `-setUserTrackingMode:animated:` is called. ([#4724](https://github.com/mapbox/mapbox-gl-native/pull/4724))
|
||||
- Rendering now occurs on the main thread, fixing a hang when calling `-[MGLMapView styleURL]` before the map view has fully loaded or while the application is in the background. ([#2909](https://github.com/mapbox/mapbox-gl-native/pull/2909))
|
||||
- Improved responsiveness when zooming in then immediately panning around. ([#4595](https://github.com/mapbox/mapbox-gl-native/pull/4595))
|
||||
- Fixed a crash setting MGLMapView’s `userLocationVerticalAlignment` property before a user location update has occurred. ([#5274](https://github.com/mapbox/mapbox-gl-native/issues/5274))
|
||||
- Added category methods on NSValue for converting to and from the structure types defined in MGLGeometry.h. ([#4802](https://github.com/mapbox/mapbox-gl-native/pull/4802))
|
||||
- Added NSFormatter subclasses for converting geographic coordinates and directions into display strings. ([#4802](https://github.com/mapbox/mapbox-gl-native/pull/4802))
|
||||
- Added a new method, `-[MGLMapView cameraThatFitsCoordinateBounds:]`, to get a camera that you can pass into `-setCamera:` that fits the given coordinate bounds. ([#4790](https://github.com/mapbox/mapbox-gl-native/pull/4790))
|
||||
- Added a `-reloadStyle:` action to MGLMapView to force a reload of the current style. ([#4728](https://github.com/mapbox/mapbox-gl-native/pull/4728))
|
||||
- A more specific user agent string is now sent with style and tile requests. ([#4012](https://github.com/mapbox/mapbox-gl-native/pull/4012))
|
||||
- Mapbox Telemetry is automatically disabled while the host application is running in the iOS Simulator. ([#4726](https://github.com/mapbox/mapbox-gl-native/pull/4726))
|
||||
- Suppressed “Unable to make space for entry” console spew. ([#4708](https://github.com/mapbox/mapbox-gl-native/pull/4708))
|
||||
- Removed unused SVG files from the SDK’s resource bundle. ([#4641](https://github.com/mapbox/mapbox-gl-native/pull/4641))
|
||||
- Deprecated `-[MGLMapView emptyMemoryCache]`. ([#4725](https://github.com/mapbox/mapbox-gl-native/pull/4725))
|
||||
- Added `MGLCoordinateInCoordinateBounds()`, a function that tests whether or not a coordinate is in a given bounds. ([#5053](https://github.com/mapbox/mapbox-gl-native/pull/5053))
|
||||
- Added a new option to `MGLMapDebugMaskOptions`, `MGLMapDebugOverdrawVisualizationMask`, that highlights overlapping drawing operations instead of the usual rendered output. ([#5403](https://github.com/mapbox/mapbox-gl-native/pull/5403))
|
||||
|
||||
### Interactivity
|
||||
|
||||
- The compass, user dot, and visible annotations are now accessible to VoiceOver users. ([#1496](https://github.com/mapbox/mapbox-gl-native/pull/1496))
|
||||
- Added a method to MGLMapView, `-anchorPointForGesture:`, that you can override to anchor gestures at a point other than the user location. ([#5302](https://github.com/mapbox/mapbox-gl-native/pull/5302))
|
||||
- Added a property to MGLMapView, `decelerationRate`, that allows you to speed up or slow down the drift animation at the end of a user gesture. You can also use this property to disable the drift animation entirely. ([#5504](https://github.com/mapbox/mapbox-gl-native/pull/5504))
|
||||
- Improved responsiveness when zooming in then immediately panning around. ([#4595](https://github.com/mapbox/mapbox-gl-native/pull/4595))
|
||||
- Added a new method, `-[MGLMapView cameraThatFitsCoordinateBounds:]`, to get a camera that you can pass into `-setCamera:` that fits the given coordinate bounds. ([#4790](https://github.com/mapbox/mapbox-gl-native/pull/4790))
|
||||
|
||||
### Annotations
|
||||
|
||||
- MGLPointAnnotation and custom MGLAnnotation implementations (but not MGLMultiPoint) can be backed by an MGLAnnotationView instead of an MGLAnnotationImage. MGLAnnotationView is a subclass of UIView, so you can use Core Animation and other familiar technologies with it. To associate an MGLAnnotation with an MGLAnnotationView, implement `-mapView:viewForAnnotation:` in your MGLMapViewDelegate class. ([#4801](https://github.com/mapbox/mapbox-gl-native/pull/4801))
|
||||
- An MGLAnnotation can be relocated by changing its `coordinate` property in a KVO-compliant way. An MGLMultiPoint cannot be relocated. ([#3835](https://github.com/mapbox/mapbox-gl-native/pull/3835))
|
||||
- Setting the `image` property of an MGLAnnotationImage to `nil` resets it to the default red pin image and reclaims resources that can be used to customize additional annotations. ([#3835](https://github.com/mapbox/mapbox-gl-native/pull/3835))
|
||||
- An MGLPolygon can now have interior polygons, representing holes knocked out of the overall shape. ([#5110](https://github.com/mapbox/mapbox-gl-native/pull/5110))
|
||||
|
||||
### User location
|
||||
|
||||
- The user dot now moves smoothly between user location updates while user location tracking is disabled. ([#1582](https://github.com/mapbox/mapbox-gl-native/pull/1582))
|
||||
- Fixed an issue preventing KVO change notifications from being generated on MGLMapView’s `userTrackingMode` key path when `-setUserTrackingMode:animated:` is called. ([#4724](https://github.com/mapbox/mapbox-gl-native/pull/4724))
|
||||
- Fixed a crash setting MGLMapView’s `userLocationVerticalAlignment` property before a user location update has occurred. ([#5274](https://github.com/mapbox/mapbox-gl-native/issues/5274))
|
||||
- Mapbox Telemetry is automatically disabled while the host application is running in the iOS Simulator. ([#4726](https://github.com/mapbox/mapbox-gl-native/pull/4726))
|
||||
|
||||
### Offline maps
|
||||
|
||||
- `MGLOfflinePackProgress` now indicates how many tiles have been downloaded and how much space they take up. ([#4874](https://github.com/mapbox/mapbox-gl-native/pull/4874))
|
||||
- Fixed an issue where the tile cache could be included in iCloud backups on the first launch. ([#5124](https://github.com/mapbox/mapbox-gl-native/pull/5124), [#5601](https://github.com/mapbox/mapbox-gl-native/pull/5601))
|
||||
- Suppressed “Unable to make space for entry” console spew. ([#4708](https://github.com/mapbox/mapbox-gl-native/pull/4708))
|
||||
- Deprecated `-[MGLMapView emptyMemoryCache]`. ([#4725](https://github.com/mapbox/mapbox-gl-native/pull/4725))
|
||||
|
||||
### Packaging
|
||||
|
||||
- Improved the design of the generated API documentation. ([#5306](https://github.com/mapbox/mapbox-gl-native/pull/5306))
|
||||
- Applications linking against the SDK static framework no longer need to add `-ObjC` to the Other Linker Flags (`OTHER_LDFLAGS`) build setting. If you previously added this flag solely for this SDK, removing the flag may potentially reduce the overall size of your application. ([#4641](https://github.com/mapbox/mapbox-gl-native/pull/4641))
|
||||
- Removed the `armv7s` slice from the SDK to reduce its size. iPhone 5 and iPhone 5c automatically use the `armv7` slice instead. ([#4641](https://github.com/mapbox/mapbox-gl-native/pull/4641))
|
||||
- The SDK is now localizable. No localizations are currently provided, other than English, but if you need a particular localization, you can install the SDK manually and drop a .lproj folder into the framework. ([#4783](https://github.com/mapbox/mapbox-gl-native/pull/4783))
|
||||
- Removed unused SVG files from the SDK’s resource bundle. ([#4641](https://github.com/mapbox/mapbox-gl-native/pull/4641))
|
||||
|
||||
### Other changes
|
||||
|
||||
- Added category methods on NSValue for converting to and from the structure types defined in MGLGeometry.h. ([#4802](https://github.com/mapbox/mapbox-gl-native/pull/4802))
|
||||
- Added NSFormatter subclasses for converting geographic coordinates and directions into display strings. ([#4802](https://github.com/mapbox/mapbox-gl-native/pull/4802))
|
||||
- Added `MGLCoordinateInCoordinateBounds()`, a function that tests whether or not a coordinate is in a given bounds. ([#5053](https://github.com/mapbox/mapbox-gl-native/pull/5053))
|
||||
|
||||
## 3.2.3
|
||||
|
||||
- Fixed an issue preventing `-[MGLMapViewDelegate mapViewDidFinishLoadingMap:]` from being called when returning to the view controller containing the map view from another view controller. ([#5164](https://github.com/mapbox/mapbox-gl-native/pull/5164))
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Pod::Spec.new do |m|
|
||||
|
||||
m.name = 'Mapbox-iOS-SDK'
|
||||
m.version = '3.3.0-beta.2-symbols'
|
||||
m.version = '3.3.0-rc.1-symbols'
|
||||
|
||||
m.summary = 'Open source vector map solution for iOS with full styling capabilities.'
|
||||
m.description = 'Open source, OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa Touch APIs.'
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Pod::Spec.new do |m|
|
||||
|
||||
m.name = 'Mapbox-iOS-SDK'
|
||||
m.version = '3.3.0-beta.2'
|
||||
m.version = '3.3.0-rc.1'
|
||||
|
||||
m.summary = 'Open source vector map solution for iOS with full styling capabilities.'
|
||||
m.description = 'Open source, OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa Touch APIs.'
|
||||
|
||||
@@ -75,7 +75,6 @@ class MapDelegate: NSObject, MGLMapViewDelegate {
|
||||
let av = PlaygroundAnnotationView(reuseIdentifier: "annotation")
|
||||
av.frame = CGRect(x: 0, y: 0, width: 30, height: 30)
|
||||
av.centerOffset = CGVector(dx: -15, dy: -15)
|
||||
av.flat = true
|
||||
let centerView = UIView(frame: CGRectInset(av.bounds, 3, 3))
|
||||
centerView.backgroundColor = UIColor.whiteColor()
|
||||
av.addSubview(centerView)
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
#import <Mapbox/Mapbox.h>
|
||||
|
||||
@interface MBXAnnotationView : MGLAnnotationView
|
||||
|
||||
@property (nonatomic) UIColor *centerColor;
|
||||
|
||||
@end
|
||||
|
||||
@@ -1,28 +1,16 @@
|
||||
#import "MBXAnnotationView.h"
|
||||
|
||||
@interface MBXAnnotationView ()
|
||||
|
||||
@property (nonatomic) UIView *centerView;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MBXAnnotationView
|
||||
|
||||
- (void)layoutSubviews {
|
||||
[super layoutSubviews];
|
||||
if (!self.centerView) {
|
||||
self.backgroundColor = [UIColor blueColor];
|
||||
self.centerView = [[UIView alloc] initWithFrame:CGRectInset(self.bounds, 1.0, 1.0)];
|
||||
self.centerView.backgroundColor = self.centerColor;
|
||||
[self addSubview:self.centerView];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)setCenterColor:(UIColor *)centerColor {
|
||||
if (![_centerColor isEqual:centerColor]) {
|
||||
_centerColor = centerColor;
|
||||
self.centerView.backgroundColor = centerColor;
|
||||
}
|
||||
|
||||
self.layer.borderColor = [UIColor blueColor].CGColor;
|
||||
self.layer.borderWidth = 1;
|
||||
self.layer.cornerRadius = 2;
|
||||
}
|
||||
|
||||
- (void)setSelected:(BOOL)selected animated:(BOOL)animated
|
||||
@@ -51,6 +39,7 @@
|
||||
case MGLAnnotationViewDragStateCanceling:
|
||||
break;
|
||||
case MGLAnnotationViewDragStateEnding: {
|
||||
self.transform = CGAffineTransformScale(CGAffineTransformIdentity, 2, 2);
|
||||
[UIView animateWithDuration:.4 delay:0 usingSpringWithDamping:.4 initialSpringVelocity:.5 options:UIViewAnimationOptionCurveLinear animations:^{
|
||||
self.transform = CGAffineTransformScale(CGAffineTransformIdentity, 1, 1);
|
||||
} completion:nil];
|
||||
@@ -60,5 +49,17 @@
|
||||
|
||||
}
|
||||
|
||||
- (nullable id<CAAction>)actionForLayer:(CALayer *)layer forKey:(NSString *)event
|
||||
{
|
||||
if (([event isEqualToString:@"transform"] || [event isEqualToString:@"position"])
|
||||
&& self.dragState == MGLAnnotationViewDragStateNone)
|
||||
{
|
||||
CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:event];
|
||||
animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
|
||||
animation.speed = 0.1;
|
||||
return animation;
|
||||
}
|
||||
return [super actionForLayer:layer forKey:event];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@@ -587,36 +587,24 @@ static NSString * const MBXViewControllerAnnotationViewReuseIdentifer = @"MBXVie
|
||||
{
|
||||
annotationView = [[MBXAnnotationView alloc] initWithReuseIdentifier:MBXViewControllerAnnotationViewReuseIdentifer];
|
||||
annotationView.frame = CGRectMake(0, 0, 10, 10);
|
||||
annotationView.centerColor = [UIColor whiteColor];
|
||||
|
||||
// uncomment to flatten the annotation view against the map when the map is tilted
|
||||
// this currently causes severe performance issues when more than 2k annotations are visible
|
||||
// annotationView.flat = YES;
|
||||
annotationView.backgroundColor = [UIColor whiteColor];
|
||||
|
||||
// uncomment to make the annotation view draggable
|
||||
// also note that having two long press gesture recognizers on overlapping views (`self.view` & `annotationView`) will cause weird behaviour
|
||||
// comment out the pin dropping functionality in the handleLongPress: method in this class to make draggable annotation views play nice
|
||||
annotationView.draggable = YES;
|
||||
|
||||
|
||||
|
||||
// uncomment to force annotation view to maintain a constant size when the map is tilted
|
||||
// by default, annotation views will shrink and grow as the move towards and away from the
|
||||
// horizon. Relatedly, annotations backed by GL sprites ONLY scale with viewing distance currently.
|
||||
// annotationView.scalesWithViewingDistance = NO;
|
||||
|
||||
} else {
|
||||
// orange indicates that the annotation view was reused
|
||||
annotationView.centerColor = [UIColor orangeColor];
|
||||
annotationView.backgroundColor = [UIColor orangeColor];
|
||||
}
|
||||
return annotationView;
|
||||
}
|
||||
|
||||
- (void)mapView:(MGLMapView *)mapView didDragAnnotationView:(nonnull MGLAnnotationView *)annotationView toCoordinate:(CLLocationCoordinate2D)coordinate
|
||||
{
|
||||
MGLPointAnnotation *annotation = (MGLPointAnnotation *)annotationView.annotation;
|
||||
annotation.coordinate = coordinate;
|
||||
}
|
||||
|
||||
- (BOOL)mapView:(__unused MGLMapView *)mapView annotationCanShowCallout:(__unused id <MGLAnnotation>)annotation
|
||||
{
|
||||
return YES;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
The Mapbox iOS SDK is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa Touch applications on iOS 7.0 and above using Objective-C, Swift, or Interface Builder. It 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.
|
||||
|
||||
[]()
|
||||
|
||||
|
||||
For setup information, check out the [Mapbox iOS SDK homepage](https://www.mapbox.com/ios-sdk/). For detailed usage instructions, read “[First steps with the Mapbox iOS SDK](https://www.mapbox.com/help/first-steps-ios-sdk/)” and consult the [online examples](https://www.mapbox.com/ios-sdk/examples/). A [full changelog](https://github.com/mapbox/mapbox-gl-native/blob/master/platform/ios/CHANGELOG.md) is also available.
|
||||
|
||||
|
||||
@@ -7,7 +7,12 @@
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
35305D481D22AA680007D005 /* NSData+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35305D471D22AA450007D005 /* NSData+MGLAdditions.mm */; };
|
||||
35305D491D22AA680007D005 /* NSData+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35305D471D22AA450007D005 /* NSData+MGLAdditions.mm */; };
|
||||
35305D4A1D22AA6A0007D005 /* NSData+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 35305D461D22AA450007D005 /* NSData+MGLAdditions.h */; settings = {ATTRIBUTES = (Private, ); }; };
|
||||
353794D01D22B3BD002C281C /* NSData+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 35305D461D22AA450007D005 /* NSData+MGLAdditions.h */; settings = {ATTRIBUTES = (Private, ); }; };
|
||||
353D23961D0B0DFE002BE09D /* MGLAnnotationViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 353D23951D0B0DFE002BE09D /* MGLAnnotationViewTests.m */; };
|
||||
35E208A71D24210F00EC9A46 /* MGLNSDataAdditionsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 35E208A61D24210F00EC9A46 /* MGLNSDataAdditionsTests.m */; };
|
||||
4018B1C71CDC287F00F666AF /* MGLAnnotationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4018B1C41CDC277F00F666AF /* MGLAnnotationView.mm */; };
|
||||
4018B1C81CDC287F00F666AF /* MGLAnnotationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4018B1C41CDC277F00F666AF /* MGLAnnotationView.mm */; };
|
||||
4018B1C91CDC288A00F666AF /* MGLAnnotationView_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4018B1C31CDC277F00F666AF /* MGLAnnotationView_Private.h */; };
|
||||
@@ -327,7 +332,10 @@
|
||||
/* End PBXCopyFilesBuildPhase section */
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
35305D461D22AA450007D005 /* NSData+MGLAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSData+MGLAdditions.h"; sourceTree = "<group>"; };
|
||||
35305D471D22AA450007D005 /* NSData+MGLAdditions.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSData+MGLAdditions.mm"; sourceTree = "<group>"; };
|
||||
353D23951D0B0DFE002BE09D /* MGLAnnotationViewTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLAnnotationViewTests.m; sourceTree = "<group>"; };
|
||||
35E208A61D24210F00EC9A46 /* MGLNSDataAdditionsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLNSDataAdditionsTests.m; sourceTree = "<group>"; };
|
||||
4018B1C31CDC277F00F666AF /* MGLAnnotationView_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAnnotationView_Private.h; sourceTree = "<group>"; };
|
||||
4018B1C41CDC277F00F666AF /* MGLAnnotationView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLAnnotationView.mm; sourceTree = "<group>"; };
|
||||
4018B1C51CDC277F00F666AF /* MGLAnnotationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAnnotationView.h; sourceTree = "<group>"; };
|
||||
@@ -651,17 +659,18 @@
|
||||
DA2E88521CC036F400F24E7B /* SDK Tests */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
DA2E88551CC036F400F24E7B /* Info.plist */,
|
||||
353D23951D0B0DFE002BE09D /* MGLAnnotationViewTests.m */,
|
||||
DA35A2C31CCA9F8300E826B2 /* MGLClockDirectionFormatterTests.m */,
|
||||
DA35A2C41CCA9F8300E826B2 /* MGLCompassDirectionFormatterTests.m */,
|
||||
DA35A2A91CCA058D00E826B2 /* MGLCoordinateFormatterTests.m */,
|
||||
DA0CD58F1CF56F6A00A5F5A5 /* MGLFeatureTests.mm */,
|
||||
DA2E885C1CC0382C00F24E7B /* MGLGeometryTests.mm */,
|
||||
35E208A61D24210F00EC9A46 /* MGLNSDataAdditionsTests.m */,
|
||||
DA2E885D1CC0382C00F24E7B /* MGLOfflinePackTests.m */,
|
||||
DA2E885E1CC0382C00F24E7B /* MGLOfflineRegionTests.m */,
|
||||
DA2E885F1CC0382C00F24E7B /* MGLOfflineStorageTests.m */,
|
||||
353D23951D0B0DFE002BE09D /* MGLAnnotationViewTests.m */,
|
||||
DA2E88601CC0382C00F24E7B /* MGLStyleTests.mm */,
|
||||
DA2E88551CC036F400F24E7B /* Info.plist */,
|
||||
);
|
||||
name = "SDK Tests";
|
||||
path = test;
|
||||
@@ -899,6 +908,8 @@
|
||||
children = (
|
||||
DA8848121CBAFA6200AB86E3 /* NSBundle+MGLAdditions.h */,
|
||||
DA8848131CBAFA6200AB86E3 /* NSBundle+MGLAdditions.m */,
|
||||
35305D461D22AA450007D005 /* NSData+MGLAdditions.h */,
|
||||
35305D471D22AA450007D005 /* NSData+MGLAdditions.mm */,
|
||||
DA8848141CBAFA6200AB86E3 /* NSException+MGLAdditions.h */,
|
||||
DA8848151CBAFA6200AB86E3 /* NSProcessInfo+MGLAdditions.h */,
|
||||
DA8848161CBAFA6200AB86E3 /* NSProcessInfo+MGLAdditions.m */,
|
||||
@@ -915,8 +926,8 @@
|
||||
children = (
|
||||
40EDA1BD1CFE0D4A00D9EA68 /* MGLAnnotationContainerView.h */,
|
||||
40EDA1BE1CFE0D4A00D9EA68 /* MGLAnnotationContainerView.m */,
|
||||
4018B1C31CDC277F00F666AF /* MGLAnnotationView_Private.h */,
|
||||
4018B1C51CDC277F00F666AF /* MGLAnnotationView.h */,
|
||||
4018B1C31CDC277F00F666AF /* MGLAnnotationView_Private.h */,
|
||||
4018B1C41CDC277F00F666AF /* MGLAnnotationView.mm */,
|
||||
DA8848341CBAFB8500AB86E3 /* MGLAnnotationImage.h */,
|
||||
DA8848401CBAFB9800AB86E3 /* MGLAnnotationImage_Private.h */,
|
||||
@@ -1004,6 +1015,7 @@
|
||||
DA88481B1CBAFA6200AB86E3 /* MGLGeometry_Private.h in Headers */,
|
||||
DA88485C1CBAFB9800AB86E3 /* MGLUserLocationAnnotationView.h in Headers */,
|
||||
DA8848871CBB033F00AB86E3 /* Fabric.h in Headers */,
|
||||
35305D4A1D22AA6A0007D005 /* NSData+MGLAdditions.h in Headers */,
|
||||
DA8848841CBB033F00AB86E3 /* FABAttributes.h in Headers */,
|
||||
DA8847FD1CBAFA5100AB86E3 /* MGLTilePyramidOfflineRegion.h in Headers */,
|
||||
DA88482F1CBAFA6200AB86E3 /* NSProcessInfo+MGLAdditions.h in Headers */,
|
||||
@@ -1049,6 +1061,7 @@
|
||||
DABFB86E1CBE9A0F00D62B32 /* MGLCalloutView.h in Headers */,
|
||||
DABFB8601CBE99E500D62B32 /* MGLMapCamera.h in Headers */,
|
||||
DA737EE21D056A4E005BDA16 /* MGLMapViewDelegate.h in Headers */,
|
||||
353794D01D22B3BD002C281C /* NSData+MGLAdditions.h in Headers */,
|
||||
DABFB86A1CBE99E500D62B32 /* MGLStyle.h in Headers */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
@@ -1359,6 +1372,7 @@
|
||||
DA2E88621CC0382C00F24E7B /* MGLOfflinePackTests.m in Sources */,
|
||||
DA35A2AA1CCA058D00E826B2 /* MGLCoordinateFormatterTests.m in Sources */,
|
||||
353D23961D0B0DFE002BE09D /* MGLAnnotationViewTests.m in Sources */,
|
||||
35E208A71D24210F00EC9A46 /* MGLNSDataAdditionsTests.m in Sources */,
|
||||
DA0CD5901CF56F6A00A5F5A5 /* MGLFeatureTests.mm in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
@@ -1386,6 +1400,7 @@
|
||||
DA35A2CB1CCAAAD200E826B2 /* NSValue+MGLAdditions.m in Sources */,
|
||||
DA8848321CBAFA6200AB86E3 /* NSString+MGLAdditions.m in Sources */,
|
||||
DA35A2A11CC9E95F00E826B2 /* MGLCoordinateFormatter.m in Sources */,
|
||||
35305D481D22AA680007D005 /* NSData+MGLAdditions.mm in Sources */,
|
||||
DA8848291CBAFA6200AB86E3 /* MGLStyle.mm in Sources */,
|
||||
DA88481C1CBAFA6200AB86E3 /* MGLGeometry.mm in Sources */,
|
||||
DA88481F1CBAFA6200AB86E3 /* MGLMultiPoint.mm in Sources */,
|
||||
@@ -1427,6 +1442,7 @@
|
||||
DA35A2CC1CCAAAD200E826B2 /* NSValue+MGLAdditions.m in Sources */,
|
||||
DAA4E4281CBB730400178DFB /* MGLTypes.m in Sources */,
|
||||
DA35A2A21CC9E95F00E826B2 /* MGLCoordinateFormatter.m in Sources */,
|
||||
35305D491D22AA680007D005 /* NSData+MGLAdditions.mm in Sources */,
|
||||
DAA4E42D1CBB730400178DFB /* MGLAnnotationImage.m in Sources */,
|
||||
DAA4E4301CBB730400178DFB /* MGLLocationManager.m in Sources */,
|
||||
DAA4E4321CBB730400178DFB /* MGLMapView.mm in Sources */,
|
||||
@@ -1717,6 +1733,7 @@
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */;
|
||||
buildSettings = {
|
||||
BITCODE_GENERATION_MODE = bitcode;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
DEFINES_MODULE = YES;
|
||||
DYLIB_COMPATIBILITY_VERSION = 1;
|
||||
@@ -1757,6 +1774,7 @@
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */;
|
||||
buildSettings = {
|
||||
BITCODE_GENERATION_MODE = bitcode;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
DEFINES_MODULE = YES;
|
||||
DYLIB_COMPATIBILITY_VERSION = 1;
|
||||
@@ -1819,6 +1837,7 @@
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */;
|
||||
buildSettings = {
|
||||
BITCODE_GENERATION_MODE = bitcode;
|
||||
HEADER_SEARCH_PATHS = (
|
||||
../default,
|
||||
../../include,
|
||||
@@ -1849,6 +1868,7 @@
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */;
|
||||
buildSettings = {
|
||||
BITCODE_GENERATION_MODE = bitcode;
|
||||
HEADER_SEARCH_PATHS = (
|
||||
../default,
|
||||
../../include,
|
||||
|
||||
@@ -21,6 +21,9 @@ custom_categories:
|
||||
- MGLMapCamera
|
||||
- MGLMapDebugMaskOptions
|
||||
- MGLMapView
|
||||
- MGLMapViewDecelerationRateFast
|
||||
- MGLMapViewDecelerationRateImmediate
|
||||
- MGLMapViewDecelerationRateNormal
|
||||
- MGLMapViewDelegate
|
||||
- MGLStyle
|
||||
- MGLStyleDefaultVersion
|
||||
@@ -31,6 +34,7 @@ custom_categories:
|
||||
- MGLAnnotationImage
|
||||
- MGLAnnotationVerticalAlignment
|
||||
- MGLAnnotationView
|
||||
- MGLAnnotationViewDragState
|
||||
- MGLCalloutView
|
||||
- MGLCalloutViewDelegate
|
||||
- MGLMultiPoint
|
||||
@@ -81,6 +85,7 @@ custom_categories:
|
||||
- MGLCoordinateBoundsMake
|
||||
- MGLCoordinateBoundsOffset
|
||||
- MGLCoordinateFormatter
|
||||
- MGLCoordinateInCoordinateBounds
|
||||
- MGLCoordinateSpan
|
||||
- MGLCoordinateSpanEqualToCoordinateSpan
|
||||
- MGLCoordinateSpanMake
|
||||
|
||||
BIN
platform/ios/originals/screenshots.sketch
Normal file
BIN
platform/ios/originals/screenshots.sketch
Normal file
Binary file not shown.
@@ -129,6 +129,14 @@
|
||||
'CLANG_ENABLE_OBJC_ARC': 'YES',
|
||||
'CLANG_ENABLE_MODULES': 'YES',
|
||||
},
|
||||
|
||||
'conditions': [
|
||||
['OS == "mac"', {
|
||||
'xcode_settings': {
|
||||
'BITCODE_GENERATION_MODE': 'bitcode',
|
||||
},
|
||||
},],
|
||||
],
|
||||
|
||||
'link_settings': {
|
||||
'libraries': [ '<@(libraries)' ],
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 295 KiB After Width: | Height: | Size: 1.2 MiB |
@@ -27,11 +27,13 @@ README=/tmp/mbgl/README.md
|
||||
cp platform/ios/docs/doc-README.md "${README}"
|
||||
# http://stackoverflow.com/a/4858011/4585461
|
||||
echo "## Changes in version ${RELEASE_VERSION}" >> "${README}"
|
||||
sed -n -e '/^## /{' -e ':a' -e 'n' -e '/^##/q' -e 'p' -e 'ba' -e '}' platform/ios/CHANGELOG.md >> "${README}"
|
||||
sed -n -e '/^## /{' -e ':a' -e 'n' -e '/^## /q' -e 'p' -e 'ba' -e '}' platform/ios/CHANGELOG.md >> "${README}"
|
||||
|
||||
rm -rf ${OUTPUT}
|
||||
mkdir -p ${OUTPUT}
|
||||
|
||||
cp platform/ios/screenshot.png "${OUTPUT}"
|
||||
|
||||
jazzy \
|
||||
--config platform/ios/jazzy.yml \
|
||||
--sdk iphonesimulator \
|
||||
@@ -40,6 +42,7 @@ jazzy \
|
||||
--module-version ${SHORT_VERSION} \
|
||||
--readme ${README} \
|
||||
--root-url https://www.mapbox.com/ios-sdk/api/${RELEASE_VERSION}/ \
|
||||
--theme platform/darwin/docs/theme \
|
||||
--output ${OUTPUT}
|
||||
# https://github.com/realm/jazzy/issues/411
|
||||
find ${OUTPUT} -name *.html -exec \
|
||||
|
||||
@@ -178,11 +178,24 @@ if [[ "${GCC_GENERATE_DEBUGGING_SYMBOLS}" == false ]]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
function create_local_podspec {
|
||||
step "Creating local podspec"
|
||||
POD_SOURCE_PATH=' :path => ".",'
|
||||
POD_FRAMEWORKS=" m.vendored_frameworks = '"${NAME}".framework'"
|
||||
[[ $SYMBOLS = YES ]] && POD_SUFFIX="-symbols" || POD_SUFFIX=""
|
||||
POD_LOCALSPEC=${OUTPUT}/$1/${NAME}-iOS-SDK${POD_SUFFIX}.podspec
|
||||
sed "s/.*:http.*/${POD_SOURCE_PATH}/" platform/ios/${NAME}-iOS-SDK${POD_SUFFIX}.podspec > ${POD_LOCALSPEC}
|
||||
sed -i.bak "s/.*vendored_frameworks.*/${POD_FRAMEWORKS}/" ${POD_LOCALSPEC}
|
||||
rm -rf ${POD_LOCALSPEC}.bak
|
||||
cp -pv LICENSE.md ${OUTPUT}/$1/
|
||||
}
|
||||
|
||||
if [[ ${BUILD_STATIC} == true ]]; then
|
||||
stat "${OUTPUT}/static/${NAME}.framework"
|
||||
fi
|
||||
if [[ ${BUILD_DYNAMIC} == true ]]; then
|
||||
stat "${OUTPUT}/dynamic/${NAME}.framework"
|
||||
create_local_podspec "dynamic"
|
||||
fi
|
||||
|
||||
if [[ ${BUILD_STATIC} == true ]]; then
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#import "MGLAPIClient.h"
|
||||
#import "NSBundle+MGLAdditions.h"
|
||||
#import "NSData+MGLAdditions.h"
|
||||
#import "MGLAccountManager.h"
|
||||
|
||||
static NSString * const MGLAPIClientUserAgentBase = @"MapboxEventsiOS";
|
||||
@@ -9,6 +10,7 @@ static NSString * const MGLAPIClientEventsPath = @"events/v2";
|
||||
static NSString * const MGLAPIClientHeaderFieldUserAgentKey = @"User-Agent";
|
||||
static NSString * const MGLAPIClientHeaderFieldContentTypeKey = @"Content-Type";
|
||||
static NSString * const MGLAPIClientHeaderFieldContentTypeValue = @"application/json";
|
||||
static NSString * const MGLAPIClientHeaderFieldContentEncodingKey = @"Content-Encoding";
|
||||
static NSString * const MGLAPIClientHTTPMethodPost = @"POST";
|
||||
|
||||
@interface MGLAPIClient ()
|
||||
@@ -82,8 +84,22 @@ static NSString * const MGLAPIClientHTTPMethodPost = @"POST";
|
||||
[request setValue:self.userAgent forHTTPHeaderField:MGLAPIClientHeaderFieldUserAgentKey];
|
||||
[request setValue:MGLAPIClientHeaderFieldContentTypeValue forHTTPHeaderField:MGLAPIClientHeaderFieldContentTypeKey];
|
||||
[request setHTTPMethod:MGLAPIClientHTTPMethodPost];
|
||||
|
||||
NSData *jsonData = [self serializedDataForEvents:events];
|
||||
[request setHTTPBody:jsonData];
|
||||
|
||||
// Compressing less than 3 events can have a negative impact on the size.
|
||||
if (events.count > 2) {
|
||||
NSData *compressedData = [jsonData mgl_compressedData];
|
||||
[request setValue:@"deflate" forHTTPHeaderField:MGLAPIClientHeaderFieldContentEncodingKey];
|
||||
[request setHTTPBody:compressedData];
|
||||
}
|
||||
|
||||
// Set JSON data if events.count were less than 3 or something went wrong with compressing HTTP body data.
|
||||
if (!request.HTTPBody) {
|
||||
[request setValue:nil forHTTPHeaderField:MGLAPIClientHeaderFieldContentEncodingKey];
|
||||
[request setHTTPBody:jsonData];
|
||||
}
|
||||
|
||||
return [request copy];
|
||||
}
|
||||
|
||||
|
||||
@@ -6,112 +6,223 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@protocol MGLAnnotation;
|
||||
|
||||
/** These constants indicate the current drag state of an annotation view. **/
|
||||
typedef NS_ENUM(NSUInteger, MGLAnnotationViewDragState) {
|
||||
MGLAnnotationViewDragStateNone = 0, // View is sitting on the map.
|
||||
MGLAnnotationViewDragStateStarting, // View is beginning to drag.
|
||||
MGLAnnotationViewDragStateDragging, // View is being dragged.
|
||||
MGLAnnotationViewDragStateCanceling, // View dragging was cancelled and will be returned to its starting positon.
|
||||
MGLAnnotationViewDragStateEnding // View was dragged.
|
||||
/**
|
||||
The view is not involved in a drag operation.
|
||||
*/
|
||||
MGLAnnotationViewDragStateNone = 0,
|
||||
/**
|
||||
An action occurred that indicated the view should begin dragging.
|
||||
|
||||
The map view automatically moves draggable annotation views to this state
|
||||
in response to the dragging the view after pressing and holding on it.
|
||||
*/
|
||||
MGLAnnotationViewDragStateStarting,
|
||||
/**
|
||||
The view is in the midst of a drag operation and is actively tracking the
|
||||
user’s gesture.
|
||||
*/
|
||||
MGLAnnotationViewDragStateDragging,
|
||||
/**
|
||||
An action occurred that indicated the view should cancel the drag
|
||||
operation.
|
||||
*/
|
||||
MGLAnnotationViewDragStateCanceling,
|
||||
/**
|
||||
An action occurred that indicated the view was dropped by the user.
|
||||
|
||||
The map view automatically moves annotation views to this state in response
|
||||
to the user lifting their finger at the end of a drag gesture.
|
||||
*/
|
||||
MGLAnnotationViewDragStateEnding,
|
||||
};
|
||||
|
||||
/** The MGLAnnotationView class is responsible for representing point-based annotation markers as a view. Annotation views represent an annotation object, which is an object that corresponds to the MGLAnnotation protocol. When an annotation’s coordinate point is visible on the map view, the map view delegate is asked to provide a corresponding annotation view. If an annotation view is created with a reuse identifier, the map view may recycle the view when it goes offscreen. */
|
||||
/**
|
||||
The `MGLAnnotationView` class is responsible for marking a point annotation
|
||||
with a view. Annotation views represent an annotation object, which is an
|
||||
object that corresponds to the `MGLAnnotation` protocol. When an annotation’s
|
||||
geographic coordinate is visible in the map view, the map view asks its
|
||||
delegate to a corresponding annotation view. If an annotation view is created
|
||||
with a reuse identifier, the map view may recycle the view when it goes
|
||||
offscreen.
|
||||
|
||||
Annotation views are compatible with UIKit, Core Animation, and other Cocoa
|
||||
Touch frameworks. On the other hand, if you do not need animation or
|
||||
interactivity such as dragging, you can use an `MGLAnnotationImage` instead to
|
||||
conserve memory and optimize drawing performance.
|
||||
*/
|
||||
@interface MGLAnnotationView : UIView
|
||||
|
||||
#pragma mark Initializing and Preparing the View
|
||||
|
||||
/**
|
||||
Initializes and returns a new annotation view object.
|
||||
|
||||
@param reuseIdentifier The string that identifies that this annotation view is reusable.
|
||||
The reuse identifier provides a way for you to improve performance by recycling
|
||||
annotation views as they enter and leave the map’s viewport. As an annotation
|
||||
leaves the viewport, the map view moves its associated view to a reuse queue.
|
||||
When a new annotation becomes visible, you can request a view for that
|
||||
annotation by passing the appropriate reuse identifier string to the
|
||||
`-[MGLMapView dequeueReusableAnnotationViewWithIdentifier:` method.
|
||||
|
||||
@param reuseIdentifier A unique string identifier for this view that allows you
|
||||
to reuse this view with multiple similar annotations. You can set this
|
||||
parameter to `nil` if you don’t intend to reuse the view, but it is a good
|
||||
idea in general to specify a reuse identifier to avoid creating redundant
|
||||
views.
|
||||
@return The initialized annotation view object.
|
||||
*/
|
||||
- (instancetype)initWithReuseIdentifier:(nullable NSString *)reuseIdentifier;
|
||||
|
||||
/**
|
||||
This property will be set to the associated annotation when the view is visible.
|
||||
Called when the view is removed from the reuse queue.
|
||||
|
||||
When the view is queued and waiting to be reused, the value will be set to nil.
|
||||
The default implementation of this method does nothing. You can override it in
|
||||
your custom annotation view implementation to put the view in a known state
|
||||
before it is returned to your map view delegate.
|
||||
*/
|
||||
- (void)prepareForReuse;
|
||||
|
||||
/**
|
||||
The annotation object currently associated with the view.
|
||||
|
||||
You should not change the value of this property directly. This property
|
||||
contains a non-`nil` value while the annotation view is visible on the map. If
|
||||
the view is queued, waiting to be reused, the value is `nil`.
|
||||
*/
|
||||
@property (nonatomic, readonly, nullable) id <MGLAnnotation> annotation;
|
||||
|
||||
/**
|
||||
The string that identifies that this annotation view is reusable. (read-only)
|
||||
The string that identifies that this annotation view is reusable.
|
||||
|
||||
You specify the reuse identifier when you create the view. You use the identifier later to retrieve an annotation view that was
|
||||
created previously but which is currently unused because its annotation is not on screen.
|
||||
You specify the reuse identifier when you create the view. You use the
|
||||
identifier later to retrieve an annotation view that was created previously but
|
||||
which is currently unused because its annotation is not on-screen.
|
||||
|
||||
If you define distinctly different types of annotations (with distinctly different annotation views to go with them), you can
|
||||
differentiate between the annotation types by specifying different reuse identifiers for each one.
|
||||
If you define distinctly different types of annotations (with distinctly
|
||||
different annotation views to go with them), you can differentiate between the
|
||||
annotation types by specifying different reuse identifiers for each one.
|
||||
*/
|
||||
@property (nonatomic, readonly, nullable) NSString *reuseIdentifier;
|
||||
|
||||
#pragma mark Configuring the Appearance
|
||||
|
||||
/**
|
||||
Annotation view is centered at the coordinate point of the associated annotation.
|
||||
The offset, measured in points, at which to place the center of the view.
|
||||
|
||||
By changing this property you can reposition the view as needed. The offset is measured in points.
|
||||
Positive offset moves the annotation view towards the bottom right, while negative offset moves it towards the top left.
|
||||
By default, the center point of an annotation view is placed at the geographic
|
||||
coordinate point of the associated annotation. If you do not want the view to
|
||||
be centered, you can use this property to reposition the view. The offset’s
|
||||
`dx` and `dy` values are measured in points. Positive offset values move the
|
||||
annotation view down and to the right, while negative values move it up and to
|
||||
the left.
|
||||
|
||||
Set the offset if the annotation view’s visual center point is somewhere other
|
||||
than the logical center of the view. For example, the view may contain an image
|
||||
that depicts a downward-pointing pushpin or thumbtack, with the tip positioned
|
||||
at the center-bottom of the view. In that case, you would set the offset’s `dx`
|
||||
to zero and its `dy` to half the height of the view.
|
||||
*/
|
||||
@property (nonatomic) CGVector centerOffset;
|
||||
|
||||
|
||||
/**
|
||||
Setting this property to YES will force the annotation view to tilt according to the associated map view.
|
||||
*/
|
||||
@property (nonatomic, assign, getter=isFlat) BOOL flat;
|
||||
|
||||
/**
|
||||
Defaults to NO and becomes YES when the view is tapped on.
|
||||
A Boolean value that determines whether the annotation view grows and shrinks
|
||||
as the distance between the viewpoint and the annotation view changes on a
|
||||
tilted map.
|
||||
|
||||
Selecting another view will first deselect the currently selected view.
|
||||
This property should not be changed directly.
|
||||
When the value of this property is `YES` and the map is tilted, the annotation
|
||||
view appears smaller if it is towards the top of the view (closer to the
|
||||
horizon) and larger if it is towards the bottom of the view (closer to the
|
||||
viewpoint). This is also the behavior of `MGLAnnotationImage` objects. When the
|
||||
value of this property is `NO` or the map’s pitch is zero, the annotation view
|
||||
remains the same size regardless of its position on-screen.
|
||||
|
||||
The default value of this property is `YES`. Set this property to `NO` if the
|
||||
view’s legibility is important.
|
||||
*/
|
||||
@property (nonatomic, assign) BOOL scalesWithViewingDistance;
|
||||
|
||||
#pragma mark Managing the Selection State
|
||||
|
||||
/**
|
||||
A Boolean value indicating whether the annotation view is currently selected.
|
||||
|
||||
You should not set the value of this property directly. If the property is set
|
||||
to `YES`, the annotation view is displaying a callout.
|
||||
|
||||
By default, this property is set to `NO` and becomes `YES` when the user taps
|
||||
the view. Selecting another annotation, whether it is associated with an
|
||||
`MGLAnnotationView` or `MGLAnnotationImage` object, deselects any currently
|
||||
selected view.
|
||||
|
||||
Setting this property changes the view’s appearance to reflect the new value
|
||||
immediately. If you want the change to be animated, use the
|
||||
`-setSelected:animated:` method instead.
|
||||
*/
|
||||
@property (nonatomic, assign, getter=isSelected) BOOL selected;
|
||||
|
||||
/**
|
||||
Subclasses may override this method in order to customize appearance.
|
||||
This method should not be called directly.
|
||||
Sets the selection state of the annotation view with an optional animation.
|
||||
|
||||
You should not call this method directly. A map view calls this method in
|
||||
response to user interactions with the annotation. Subclasses may override this
|
||||
method in order to customize the appearance of the view depending on its
|
||||
selection state.
|
||||
|
||||
@param selected `YES` if the view should display itself as selected; `NO`
|
||||
if it should display itself as unselected.
|
||||
@param animated `YES` if the change in selection state is animated; `NO` if the
|
||||
change is immediate.
|
||||
*/
|
||||
- (void)setSelected:(BOOL)selected animated:(BOOL)animated;
|
||||
|
||||
/*
|
||||
This property defaults to YES. Setting it to NO will cause the annotation view to ignore all touch events.
|
||||
Subclasses may use this property to customize the appearance.
|
||||
A Boolean value indicating whether the annotation is enabled.
|
||||
|
||||
The default value of this property is `YES`. If the value of this property is
|
||||
`NO`, the annotation view ignores touch events and cannot be selected.
|
||||
Subclasses may also customize the appearance of the view depending on its
|
||||
enabled state.
|
||||
*/
|
||||
@property (nonatomic, assign, getter=isEnabled) BOOL enabled;
|
||||
|
||||
#pragma mark Supporting Drag Operations
|
||||
|
||||
/**
|
||||
Setting this property to YES will make the view draggable. Long-press followed by a pan gesture will start to move the
|
||||
view around the map. `-mapView:didDragAnnotationView:toCoordinate:` will be called when a view is dropped.
|
||||
A Boolean value indicating whether the annotation view is draggable.
|
||||
|
||||
If this property is set to `YES`, the user can drag the annotation after
|
||||
pressing and holding the view, and the associated annotation object must also
|
||||
implement the `-setCoordinate:` method. The default value of this property is
|
||||
`NO`.
|
||||
|
||||
Setting this property to `YES` lets the map view know that the annotation is
|
||||
always draggable. In other words, you cannot conditionalize drag operations by
|
||||
attempting to stop an operation that has already been initiated; doing so can
|
||||
lead to undefined behavior. Once begun, the drag operation should always
|
||||
continue to completion.
|
||||
*/
|
||||
@property (nonatomic, assign, getter=isDraggable) BOOL draggable;
|
||||
|
||||
/**
|
||||
All states are handled automatically when `draggable` is set to YES.
|
||||
Custom animations can be achieved by overriding setDragState:animated:
|
||||
The current drag state of the annotation view.
|
||||
|
||||
All states are handled automatically when the `draggable` property is set to
|
||||
`YES`. To perform a custom animation in response to a change to this property,
|
||||
override the `-setDragState:animated:` method.
|
||||
*/
|
||||
@property (nonatomic, readonly) MGLAnnotationViewDragState dragState;
|
||||
|
||||
/**
|
||||
Called when the `dragState` changes.
|
||||
Sets the current drag state for the annotation view.
|
||||
|
||||
Implementer may override this method in order to customize animations in subclasses.
|
||||
You can override this method to animate a custom annotation view as the user
|
||||
drags it. As the system detects user actions that would indicate a drag, it
|
||||
calls this method to update the drag state.
|
||||
*/
|
||||
- (void)setDragState:(MGLAnnotationViewDragState)dragState animated:(BOOL)animated NS_REQUIRES_SUPER;
|
||||
|
||||
/**
|
||||
Setting this property to YES will cause the annotation view to shrink as it approaches the horizon and grow as it moves away from the
|
||||
horizon when the associated map view is tilted. Conversely, setting this property to NO will ensure that the annotation view maintains
|
||||
a constant size even when the map view is tilted. To maintain consistency with annotation representations that are not backed by an
|
||||
MGLAnnotationView object, the default value of this property is YES.
|
||||
*/
|
||||
@property (nonatomic, assign, getter=isScaledWithViewingDistance) BOOL scalesWithViewingDistance;
|
||||
|
||||
/**
|
||||
Called when the view is removed from the reuse queue.
|
||||
|
||||
The default implementation of this method does nothing. You can override it in your custom annotation views and use it to put the view
|
||||
in a known state before it is returned to your map view delegate.
|
||||
*/
|
||||
- (void)prepareForReuse;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
@@ -54,42 +54,46 @@
|
||||
[self didChangeValueForKey:@"selected"];
|
||||
}
|
||||
|
||||
- (void)setCenter:(CGPoint)center
|
||||
- (CGPoint)center
|
||||
{
|
||||
[self setCenter:center pitch:0];
|
||||
CGPoint center = super.center;
|
||||
center.x -= _centerOffset.dx;
|
||||
center.y -= _centerOffset.dy;
|
||||
return center;
|
||||
}
|
||||
|
||||
- (void)setCenter:(CGPoint)center pitch:(CGFloat)pitch
|
||||
- (void)setCenter:(CGPoint)center
|
||||
{
|
||||
center.x += _centerOffset.dx;
|
||||
center.y += _centerOffset.dy;
|
||||
|
||||
[super setCenter:center];
|
||||
|
||||
super.center = center;
|
||||
[self updateTransform];
|
||||
}
|
||||
|
||||
- (void)setScalesWithViewingDistance:(BOOL)scalesWithViewingDistance
|
||||
{
|
||||
if (_scalesWithViewingDistance != scalesWithViewingDistance)
|
||||
{
|
||||
_scalesWithViewingDistance = scalesWithViewingDistance;
|
||||
[self updateTransform];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)updateTransform
|
||||
{
|
||||
// Omit applying a new transformation while the view is being dragged.
|
||||
if (self.dragState == MGLAnnotationViewDragStateDragging) {
|
||||
if (self.dragState == MGLAnnotationViewDragStateDragging)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (self.flat)
|
||||
self.layer.transform = CATransform3DIdentity;
|
||||
if ( ! self.scalesWithViewingDistance)
|
||||
{
|
||||
[self updatePitch:pitch];
|
||||
return;
|
||||
}
|
||||
|
||||
if (self.scalesWithViewingDistance)
|
||||
{
|
||||
[self updateScaleForPitch:pitch];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)updatePitch:(CGFloat)pitch
|
||||
{
|
||||
CATransform3D t = CATransform3DRotate(CATransform3DIdentity, MGLRadiansFromDegrees(pitch), 1.0, 0, 0);
|
||||
self.layer.transform = t;
|
||||
}
|
||||
|
||||
- (void)updateScaleForPitch:(CGFloat)pitch
|
||||
{
|
||||
|
||||
CGFloat superviewHeight = CGRectGetHeight(self.superview.frame);
|
||||
if (superviewHeight > 0.0) {
|
||||
// Find the maximum amount of scale reduction to apply as the view's center moves from the top
|
||||
@@ -104,7 +108,7 @@
|
||||
// as the map view will allow). The map view's maximum pitch is defined in `mbgl::util::PITCH_MAX`.
|
||||
// Since it is possible for the map view to report a pitch less than 0 due to the nature of
|
||||
// how the gesture information is captured, the value is guarded with MAX.
|
||||
CGFloat pitchIntensity = MAX(pitch, 0) / MGLDegreesFromRadians(mbgl::util::PITCH_MAX);
|
||||
CGFloat pitchIntensity = MAX(self.mapView.camera.pitch, 0) / MGLDegreesFromRadians(mbgl::util::PITCH_MAX);
|
||||
|
||||
// The pitch adjusted scale is the inverse proportion of the maximum possible scale reduction
|
||||
// multiplied by the pitch intensity. For example, if the maximum scale reduction is 75% and the
|
||||
@@ -112,7 +116,7 @@
|
||||
// reduction is then normalized for a scale of 1.0.
|
||||
CGFloat pitchAdjustedScale = 1.0 - maxScaleReduction * pitchIntensity;
|
||||
|
||||
CATransform3D transform = self.flat ? self.layer.transform : CATransform3DIdentity;
|
||||
CATransform3D transform = CATransform3DIdentity;
|
||||
self.layer.transform = CATransform3DScale(transform, pitchAdjustedScale, pitchAdjustedScale, 1);
|
||||
}
|
||||
}
|
||||
@@ -185,9 +189,8 @@
|
||||
|
||||
- (void)handlePan:(UIPanGestureRecognizer *)sender
|
||||
{
|
||||
CGPoint center = [sender locationInView:sender.view.superview];
|
||||
[self setCenter:center pitch:self.mapView.camera.pitch];
|
||||
|
||||
self.center = [sender locationInView:sender.view.superview];
|
||||
|
||||
if (sender.state == UIGestureRecognizerStateEnded) {
|
||||
self.dragState = MGLAnnotationViewDragStateNone;
|
||||
}
|
||||
@@ -206,19 +209,24 @@
|
||||
|
||||
if (dragState == MGLAnnotationViewDragStateStarting)
|
||||
{
|
||||
[self.mapView.calloutViewForSelectedAnnotation dismissCalloutAnimated:animated];
|
||||
[self.superview bringSubviewToFront:self];
|
||||
}
|
||||
|
||||
if (dragState == MGLAnnotationViewDragStateEnding)
|
||||
else if (dragState == MGLAnnotationViewDragStateCanceling)
|
||||
{
|
||||
if ([self.mapView.delegate respondsToSelector:@selector(mapView:didDragAnnotationView:toCoordinate:)])
|
||||
self.panGestureRecognizer.enabled = NO;
|
||||
self.longPressRecognizer.enabled = NO;
|
||||
self.center = [self.mapView convertCoordinate:self.annotation.coordinate toPointToView:self.mapView];
|
||||
self.panGestureRecognizer.enabled = YES;
|
||||
self.longPressRecognizer.enabled = YES;
|
||||
self.dragState = MGLAnnotationViewDragStateNone;
|
||||
}
|
||||
else if (dragState == MGLAnnotationViewDragStateEnding)
|
||||
{
|
||||
if ([self.annotation respondsToSelector:@selector(setCoordinate:)])
|
||||
{
|
||||
CGPoint offsetAdjustedCenter = self.center;
|
||||
offsetAdjustedCenter.x -= self.centerOffset.dx;
|
||||
offsetAdjustedCenter.y -= self.centerOffset.dy;
|
||||
|
||||
CLLocationCoordinate2D coordinate = [self.mapView convertPoint:offsetAdjustedCenter toCoordinateFromView:self.mapView];
|
||||
[self.mapView.delegate mapView:self.mapView didDragAnnotationView:self toCoordinate:coordinate];
|
||||
CLLocationCoordinate2D coordinate = [self.mapView convertPoint:self.center toCoordinateFromView:self.mapView];
|
||||
[(NSObject *)self.annotation setValue:[NSValue valueWithMGLCoordinate:coordinate] forKey:@"coordinate"];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -231,19 +239,19 @@
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
|
||||
{
|
||||
return YES;
|
||||
return otherGestureRecognizer == _longPressRecognizer || otherGestureRecognizer == _panGestureRecognizer;
|
||||
}
|
||||
|
||||
- (id<CAAction>)actionForLayer:(CALayer *)layer forKey:(NSString *)event
|
||||
{
|
||||
// Allow mbgl to drive animation of this view’s bounds.
|
||||
if ([event isEqualToString:@"bounds"])
|
||||
if ([event isEqualToString:@"bounds"] || [event isEqualToString:@"position"])
|
||||
{
|
||||
return [NSNull null];
|
||||
}
|
||||
|
||||
@@ -11,8 +11,6 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
@property (nonatomic, readwrite, nullable) id <MGLAnnotation> annotation;
|
||||
@property (nonatomic, weak) MGLMapView *mapView;
|
||||
|
||||
- (void)setCenter:(CGPoint)center pitch:(CGFloat)pitch;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
@@ -21,6 +21,15 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
@protocol MGLCalloutView;
|
||||
@protocol MGLFeature;
|
||||
|
||||
/** The default deceleration rate for a map view. */
|
||||
extern const CGFloat MGLMapViewDecelerationRateNormal;
|
||||
|
||||
/** A fast deceleration rate for a map view. */
|
||||
extern const CGFloat MGLMapViewDecelerationRateFast;
|
||||
|
||||
/** Disables decleration in a map view. */
|
||||
extern const CGFloat MGLMapViewDecelerationRateImmediate;
|
||||
|
||||
/** The vertical alignment of an annotation within a map view. */
|
||||
typedef NS_ENUM(NSUInteger, MGLAnnotationVerticalAlignment) {
|
||||
/** Aligns the annotation vertically in the center of the map view. */
|
||||
@@ -404,6 +413,17 @@ IB_DESIGNABLE
|
||||
*/
|
||||
@property(nonatomic, getter=isPitchEnabled) BOOL pitchEnabled;
|
||||
|
||||
/**
|
||||
A floating-point value that determines the rate of deceleration after the user
|
||||
lifts their finger.
|
||||
|
||||
Your application can use the `MGLMapViewDecelerationRateNormal` and
|
||||
`MGLMapViewDecelerationRateFast` constants as reference points for reasonable
|
||||
deceleration rates. `MGLMapViewDecelerationRateImmediate` can be used to
|
||||
disable deceleration entirely.
|
||||
*/
|
||||
@property(nonatomic) CGFloat decelerationRate;
|
||||
|
||||
#pragma mark Manipulating the Viewpoint
|
||||
|
||||
/**
|
||||
|
||||
@@ -51,6 +51,10 @@
|
||||
class MBGLView;
|
||||
class MGLAnnotationContext;
|
||||
|
||||
const CGFloat MGLMapViewDecelerationRateNormal = UIScrollViewDecelerationRateNormal;
|
||||
const CGFloat MGLMapViewDecelerationRateFast = UIScrollViewDecelerationRateFast;
|
||||
const CGFloat MGLMapViewDecelerationRateImmediate = 0.0;
|
||||
|
||||
/// Indicates the manner in which the map view is tracking the user location.
|
||||
typedef NS_ENUM(NSUInteger, MGLUserTrackingState) {
|
||||
/// The map view is not yet tracking the user location.
|
||||
@@ -500,6 +504,8 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration)
|
||||
[self addGestureRecognizer:_twoFingerDrag];
|
||||
_pitchEnabled = YES;
|
||||
|
||||
_decelerationRate = MGLMapViewDecelerationRateNormal;
|
||||
|
||||
if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone)
|
||||
{
|
||||
_quickZoom = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleQuickZoomGesture:)];
|
||||
@@ -579,8 +585,9 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration)
|
||||
UIGraphicsBeginImageContextWithOptions(scaleImage.size, NO, [UIScreen mainScreen].scale);
|
||||
[scaleImage drawInRect:{ CGPointZero, scaleImage.size }];
|
||||
|
||||
CGFloat weight = &UIFontWeightUltraLight ? UIFontWeightUltraLight : -0.8;
|
||||
NSAttributedString *north = [[NSAttributedString alloc] initWithString:NSLocalizedStringWithDefaultValue(@"COMPASS_NORTH", nil, nil, @"N", @"Compass abbreviation for north") attributes:@{
|
||||
NSFontAttributeName: [UIFont systemFontOfSize:9 weight:UIFontWeightUltraLight],
|
||||
NSFontAttributeName: [UIFont systemFontOfSize:9 weight:weight],
|
||||
NSForegroundColorAttributeName: [UIColor whiteColor],
|
||||
}];
|
||||
CGRect stringRect = CGRectMake((scaleImage.size.width - north.size.width) / 2,
|
||||
@@ -1201,18 +1208,17 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration)
|
||||
else if (pan.state == UIGestureRecognizerStateEnded || pan.state == UIGestureRecognizerStateCancelled)
|
||||
{
|
||||
CGPoint velocity = [pan velocityInView:pan.view];
|
||||
if (sqrtf(velocity.x * velocity.x + velocity.y * velocity.y) < 100)
|
||||
if (self.decelerationRate == MGLMapViewDecelerationRateImmediate || sqrtf(velocity.x * velocity.x + velocity.y * velocity.y) < 100)
|
||||
{
|
||||
// Not enough velocity to overcome friction
|
||||
velocity = CGPointZero;
|
||||
}
|
||||
|
||||
NSTimeInterval duration = UIScrollViewDecelerationRateNormal;
|
||||
BOOL drift = ! CGPointEqualToPoint(velocity, CGPointZero);
|
||||
if (drift)
|
||||
{
|
||||
CGPoint offset = CGPointMake(velocity.x * duration / 4, velocity.y * duration / 4);
|
||||
_mbglMap->moveBy({ offset.x, offset.y }, MGLDurationInSeconds(duration));
|
||||
CGPoint offset = CGPointMake(velocity.x * self.decelerationRate / 4, velocity.y * self.decelerationRate / 4);
|
||||
_mbglMap->moveBy({ offset.x, offset.y }, MGLDurationInSeconds(self.decelerationRate));
|
||||
}
|
||||
|
||||
[self notifyGestureDidEndWithDrift:drift];
|
||||
@@ -1282,7 +1288,7 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration)
|
||||
velocity = 0;
|
||||
}
|
||||
|
||||
NSTimeInterval duration = velocity > 0 ? 1 : 0.25;
|
||||
NSTimeInterval duration = (velocity > 0 ? 1 : 0.25) * self.decelerationRate;
|
||||
|
||||
CGFloat scale = self.scale * pinch.scale;
|
||||
CGFloat newScale = scale;
|
||||
@@ -1300,12 +1306,12 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration)
|
||||
velocity = 0;
|
||||
}
|
||||
|
||||
if (velocity)
|
||||
if (velocity && duration)
|
||||
{
|
||||
_mbglMap->setScale(newScale, mbgl::ScreenCoordinate { centerPoint.x, centerPoint.y }, MGLDurationInSeconds(duration));
|
||||
}
|
||||
|
||||
[self notifyGestureDidEndWithDrift:velocity];
|
||||
[self notifyGestureDidEndWithDrift:velocity && duration];
|
||||
|
||||
[self unrotateIfNeededForGesture];
|
||||
}
|
||||
@@ -1354,21 +1360,20 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration)
|
||||
else if (rotate.state == UIGestureRecognizerStateEnded || rotate.state == UIGestureRecognizerStateCancelled)
|
||||
{
|
||||
CGFloat velocity = rotate.velocity;
|
||||
|
||||
if (fabs(velocity) > 3)
|
||||
CGFloat decelerationRate = self.decelerationRate;
|
||||
if (decelerationRate != MGLMapViewDecelerationRateImmediate && fabs(velocity) > 3)
|
||||
{
|
||||
CGFloat radians = self.angle + rotate.rotation;
|
||||
NSTimeInterval duration = UIScrollViewDecelerationRateNormal;
|
||||
CGFloat newRadians = radians + velocity * duration * 0.1;
|
||||
CGFloat newRadians = radians + velocity * decelerationRate * 0.1;
|
||||
CGFloat newDegrees = MGLDegreesFromRadians(newRadians) * -1;
|
||||
|
||||
_mbglMap->setBearing(newDegrees, mbgl::ScreenCoordinate { centerPoint.x, centerPoint.y }, MGLDurationInSeconds(duration));
|
||||
_mbglMap->setBearing(newDegrees, mbgl::ScreenCoordinate { centerPoint.x, centerPoint.y }, MGLDurationInSeconds(decelerationRate));
|
||||
|
||||
[self notifyGestureDidEndWithDrift:YES];
|
||||
|
||||
__weak MGLMapView *weakSelf = self;
|
||||
|
||||
[self animateWithDelay:duration animations:^
|
||||
[self animateWithDelay:decelerationRate animations:^
|
||||
{
|
||||
[weakSelf unrotateIfNeededForGesture];
|
||||
}];
|
||||
@@ -1767,16 +1772,19 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration)
|
||||
if (annotation == [self annotationWithTag:annotationTag])
|
||||
{
|
||||
const mbgl::Point<double> point = MGLPointFromLocationCoordinate2D(annotation.coordinate);
|
||||
|
||||
|
||||
MGLAnnotationContext &annotationContext = _annotationContextsByAnnotationTag.at(annotationTag);
|
||||
NSString *symbolName;
|
||||
if (!annotationContext.annotationView)
|
||||
if (annotationContext.annotationView)
|
||||
{
|
||||
MGLAnnotationImage *annotationImage = [self imageOfAnnotationWithTag:annotationTag];
|
||||
symbolName = annotationImage.styleIconIdentifier;
|
||||
// Redundantly move the associated annotation view outside the scope of the animation-less transaction block in -updateAnnotationViews.
|
||||
annotationContext.annotationView.center = [self convertCoordinate:annotationContext.annotation.coordinate toPointToView:self];
|
||||
}
|
||||
|
||||
_mbglMap->updateAnnotation(annotationTag, mbgl::SymbolAnnotation { point, symbolName.UTF8String ?: "" });
|
||||
MGLAnnotationImage *annotationImage = [self imageOfAnnotationWithTag:annotationTag];
|
||||
NSString *symbolName = annotationImage.styleIconIdentifier;
|
||||
|
||||
// Update the annotation’s backing geometry to match the annotation model object. Any associated annotation view is also moved by side effect. However, -updateAnnotationViews disables the view’s animation actions, because it can’t distinguish between moves due to the viewport changing and moves due to the annotation’s coordinate changing.
|
||||
_mbglMap->updateAnnotation(annotationTag, mbgl::SymbolAnnotation { point, symbolName.UTF8String });
|
||||
if (annotationTag == _selectedAnnotationTag)
|
||||
{
|
||||
[self deselectAnnotation:annotation animated:YES];
|
||||
@@ -2934,6 +2942,12 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration)
|
||||
[self updateAnnotationContainerViewWithAnnotationViews:newAnnotationViews];
|
||||
|
||||
[self didChangeValueForKey:@"annotations"];
|
||||
|
||||
if ([self.delegate respondsToSelector:@selector(mapView:didAddAnnotationViews:)])
|
||||
{
|
||||
[self.delegate mapView:self didAddAnnotationViews:newAnnotationViews];
|
||||
}
|
||||
|
||||
UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, nil);
|
||||
}
|
||||
|
||||
@@ -2997,6 +3011,7 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration)
|
||||
if (annotationView)
|
||||
{
|
||||
annotationView.annotation = annotation;
|
||||
annotationView.mapView = self;
|
||||
CGRect bounds = UIEdgeInsetsInsetRect({ CGPointZero, annotationView.frame.size }, annotationView.alignmentRectInsets);
|
||||
|
||||
_largestAnnotationViewSize = CGSizeMake(MAX(_largestAnnotationViewSize.width, CGRectGetWidth(bounds)),
|
||||
@@ -4548,6 +4563,9 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration)
|
||||
return;
|
||||
}
|
||||
|
||||
[CATransaction begin];
|
||||
[CATransaction setDisableActions:YES];
|
||||
|
||||
for (auto &pair : _annotationContextsByAnnotationTag)
|
||||
{
|
||||
CGRect viewPort = CGRectInset(self.bounds,
|
||||
@@ -4568,8 +4586,7 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration)
|
||||
[self.glView addSubview:annotationView];
|
||||
}
|
||||
|
||||
CGPoint center = [self convertCoordinate:annotationContext.annotation.coordinate toPointToView:self];
|
||||
[annotationView setCenter:center pitch:self.camera.pitch];
|
||||
annotationView.center = [self convertCoordinate:annotationContext.annotation.coordinate toPointToView:self];
|
||||
annotationView.mapView = self;
|
||||
annotationContext.annotationView = annotationView;
|
||||
}
|
||||
@@ -4582,10 +4599,11 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration)
|
||||
}
|
||||
else
|
||||
{
|
||||
CGPoint center = [self convertCoordinate:annotationContext.annotation.coordinate toPointToView:self];
|
||||
[annotationView setCenter:center pitch:self.camera.pitch];
|
||||
annotationView.center = [self convertCoordinate:annotationContext.annotation.coordinate toPointToView:self];
|
||||
}
|
||||
}
|
||||
|
||||
[CATransaction commit];
|
||||
}
|
||||
|
||||
- (void)enqueueAnnotationViewForAnnotationContext:(MGLAnnotationContext &)annotationContext
|
||||
|
||||
@@ -6,7 +6,15 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class MGLMapView;
|
||||
|
||||
/** The MGLMapViewDelegate protocol defines a set of optional methods that you can use to receive map-related update messages. Because many map operations require the `MGLMapView` class to load data asynchronously, the map view calls these methods to notify your application when specific operations complete. The map view also uses these methods to request annotation marker symbology and to manage interactions with those markers. */
|
||||
/**
|
||||
The `MGLMapViewDelegate` protocol defines a set of optional methods that you
|
||||
can use to receive map-related update messages. Because many map operations
|
||||
require the `MGLMapView` class to load data asynchronously, the map view calls
|
||||
these methods to notify your application when specific operations complete. The
|
||||
map view also uses these methods to request information about annotations
|
||||
displayed on the map, such as the styles and interaction modes to apply to
|
||||
individual annotations.
|
||||
*/
|
||||
@protocol MGLMapViewDelegate <NSObject>
|
||||
|
||||
@optional
|
||||
@@ -14,30 +22,39 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
#pragma mark Responding to Map Position Changes
|
||||
|
||||
/**
|
||||
Tells the delegate that the region displayed by the map view is about to change.
|
||||
Tells the delegate that the viewpoint depicted by the map view is about to
|
||||
change.
|
||||
|
||||
This method is called whenever the currently displayed map region will start changing.
|
||||
This method is called whenever the currently displayed map camera will start
|
||||
changing for any reason.
|
||||
|
||||
@param mapView The map view whose visible region will change.
|
||||
@param mapView The map view whose viewpoint will change.
|
||||
@param animated Whether the change will cause an animated effect on the map.
|
||||
*/
|
||||
- (void)mapView:(MGLMapView *)mapView regionWillChangeAnimated:(BOOL)animated;
|
||||
|
||||
/**
|
||||
Tells the delegate that the region displayed by the map view is changing.
|
||||
Tells the delegate that the viewpoint depicted by the map view is changing.
|
||||
|
||||
This method is called whenever the currently displayed map region changes. During movement, this method may be called many times to report updates to the map position. Therefore, your implementation of this method should be as lightweight as possible to avoid affecting performance.
|
||||
This method is called as the currently displayed map camera changes as part of
|
||||
an animation, whether due to a user gesture or due to a call to a method such
|
||||
as `-[MGLMapView setCamera:animated:]`. During the animation, this method may
|
||||
be called many times to report updates to the viewpoint. Therefore, your
|
||||
implementation of this method should be as lightweight as possible to avoid
|
||||
affecting performance.
|
||||
|
||||
@param mapView The map view whose visible region is changing.
|
||||
@param mapView The map view whose viewpoint is changing.
|
||||
*/
|
||||
- (void)mapViewRegionIsChanging:(MGLMapView *)mapView;
|
||||
|
||||
/**
|
||||
Tells the delegate that the region displayed by the map view just changed.
|
||||
Tells the delegate that the viewpoint depicted by the map view has finished
|
||||
changing.
|
||||
|
||||
This method is called whenever the currently displayed map region has finished changing.
|
||||
This method is called whenever the currently displayed map camera has finished
|
||||
changing, after any calls to `-mapViewRegionIsChanging:` due to animation.
|
||||
|
||||
@param mapView The map view whose visible region changed.
|
||||
@param mapView The map view whose viewpoint has changed.
|
||||
@param animated Whether the change caused an animated effect on the map.
|
||||
*/
|
||||
- (void)mapView:(MGLMapView *)mapView regionDidChangeAnimated:(BOOL)animated;
|
||||
@@ -47,7 +64,8 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
/**
|
||||
Tells the delegate that the map view will begin to load.
|
||||
|
||||
This method is called whenever the map view starts loading, including when a new style has been set and the map must reload.
|
||||
This method is called whenever the map view starts loading, including when a
|
||||
new style has been set and the map must reload.
|
||||
|
||||
@param mapView The map view that is starting to load.
|
||||
*/
|
||||
@@ -56,7 +74,8 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
/**
|
||||
Tells the delegate that the map view has finished loading.
|
||||
|
||||
This method is called whenever the map view finishes loading, either after the initial load or after a style change has forced a reload.
|
||||
This method is called whenever the map view finishes loading, either after the
|
||||
initial load or after a style change has forced a reload.
|
||||
|
||||
@param mapView The map view that has finished loading.
|
||||
*/
|
||||
@@ -71,56 +90,87 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
// TODO
|
||||
- (void)mapViewDidFinishRenderingMap:(MGLMapView *)mapView fullyRendered:(BOOL)fullyRendered;
|
||||
|
||||
// TODO
|
||||
/**
|
||||
Tells the delegate that the map view is about to redraw.
|
||||
|
||||
This method is called any time the map view needs to redraw due to a change in
|
||||
the viewpoint or style property transition. This method may be called very
|
||||
frequently, even moreso than `-mapViewRegionIsChanging:`. Therefore, your
|
||||
implementation of this method should be as lightweight as possible to avoid
|
||||
affecting performance.
|
||||
|
||||
@param mapView The map view that is about to redraw.
|
||||
*/
|
||||
- (void)mapViewWillStartRenderingFrame:(MGLMapView *)mapView;
|
||||
|
||||
// TODO
|
||||
/**
|
||||
Tells the delegate that the map view has just redrawn.
|
||||
|
||||
This method is called any time the map view needs to redraw due to a change in
|
||||
the viewpoint or style property transition. This method may be called very
|
||||
frequently, even moreso than `-mapViewRegionIsChanging:`. Therefore, your
|
||||
implementation of this method should be as lightweight as possible to avoid
|
||||
affecting performance.
|
||||
|
||||
@param mapView The map view that has just redrawn.
|
||||
*/
|
||||
- (void)mapViewDidFinishRenderingFrame:(MGLMapView *)mapView fullyRendered:(BOOL)fullyRendered;
|
||||
|
||||
#pragma mark Tracking User Location
|
||||
|
||||
/**
|
||||
Tells the delegate that the map view will begin tracking the user's location.
|
||||
Tells the delegate that the map view will begin tracking the user’s location.
|
||||
|
||||
This method is called when the value of the `showsUserLocation` property changes to `YES`.
|
||||
This method is called when the value of the `showsUserLocation` property
|
||||
changes to `YES`.
|
||||
|
||||
@param mapView The map view that is tracking the user's location.
|
||||
@param mapView The map view that is tracking the user’s location.
|
||||
*/
|
||||
- (void)mapViewWillStartLocatingUser:(MGLMapView *)mapView;
|
||||
|
||||
/**
|
||||
Tells the delegate that the map view has stopped tracking the user's location.
|
||||
Tells the delegate that the map view has stopped tracking the user’s location.
|
||||
|
||||
This method is called when the value of the `showsUserLocation` property changes to `NO`.
|
||||
This method is called when the value of the `showsUserLocation` property
|
||||
changes to `NO`.
|
||||
|
||||
@param mapView The map view that is tracking the user's location.
|
||||
@param mapView The map view that is tracking the user’s location.
|
||||
*/
|
||||
- (void)mapViewDidStopLocatingUser:(MGLMapView *)mapView;
|
||||
|
||||
/**
|
||||
Tells the delegate that the location of the user was updated.
|
||||
|
||||
While the `showsUserLocation` property is set to `YES`, this method is called whenever a new location update is received by the map view. This method is also called if the map view's user tracking mode is set to `MGLUserTrackingModeFollowWithHeading` and the heading changes, or if it is set to `MGLUserTrackingModeFollowWithCourse` and the course changes.
|
||||
While the `showsUserLocation` property is set to `YES`, this method is called
|
||||
whenever a new location update is received by the map view. This method is also
|
||||
called if the map view’s user tracking mode is set to
|
||||
`MGLUserTrackingModeFollowWithHeading` and the heading changes, or if it is set
|
||||
to `MGLUserTrackingModeFollowWithCourse` and the course changes.
|
||||
|
||||
This method is not called if the application is currently running in the background. If you want to receive location updates while running in the background, you must use the Core Location framework.
|
||||
This method is not called if the application is currently running in the
|
||||
background. If you want to receive location updates while running in the
|
||||
background, you must use the Core Location framework.
|
||||
|
||||
@param mapView The map view that is tracking the user's location.
|
||||
@param userLocation The location object representing the user's latest location. This property may be `nil`.
|
||||
@param mapView The map view that is tracking the user’s location.
|
||||
@param userLocation The location object representing the user’s latest
|
||||
location. This property may be `nil`.
|
||||
*/
|
||||
- (void)mapView:(MGLMapView *)mapView didUpdateUserLocation:(nullable MGLUserLocation *)userLocation;
|
||||
|
||||
/**
|
||||
Tells the delegate that an attempt to locate the user's position failed.
|
||||
Tells the delegate that an attempt to locate the user’s position failed.
|
||||
|
||||
@param mapView The map view that is tracking the user's location.
|
||||
@param error An error object containing the reason why location tracking failed.
|
||||
@param mapView The map view that is tracking the user’s location.
|
||||
@param error An error object containing the reason why location tracking
|
||||
failed.
|
||||
*/
|
||||
- (void)mapView:(MGLMapView *)mapView didFailToLocateUserWithError:(NSError *)error;
|
||||
|
||||
/**
|
||||
Tells the delegate that the map view's user tracking mode has changed.
|
||||
Tells the delegate that the map view’s user tracking mode has changed.
|
||||
|
||||
This method is called after the map view asynchronously changes to reflect the new user tracking mode, for example by beginning to zoom or rotate.
|
||||
This method is called after the map view asynchronously changes to reflect the
|
||||
new user tracking mode, for example by beginning to zoom or rotate.
|
||||
|
||||
@param mapView The map view that changed its tracking mode.
|
||||
@param mode The new tracking mode.
|
||||
@@ -128,37 +178,46 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
*/
|
||||
- (void)mapView:(MGLMapView *)mapView didChangeUserTrackingMode:(MGLUserTrackingMode)mode animated:(BOOL)animated;
|
||||
|
||||
#pragma mark Managing the Display of Annotations
|
||||
#pragma mark Managing the Appearance of Annotations
|
||||
|
||||
/**
|
||||
Returns a view object to use for the marker for the specified point annotation object.
|
||||
Returns an annotation image object to mark the given point annotation object on
|
||||
the map.
|
||||
|
||||
@param mapView The map view that requested the annotation view.
|
||||
@param annotation The object representing the annotation that is about to be displayed.
|
||||
@return The view object to display for the specified annotation or `nil` if you want to display the default marker image.
|
||||
*/
|
||||
- (nullable MGLAnnotationView *)mapView:(MGLMapView *)mapView viewForAnnotation:(id <MGLAnnotation>)annotation;
|
||||
|
||||
/**
|
||||
Returns an image object to use for the marker for the specified point annotation object.
|
||||
Implement this method to mark a point annotation with a static image. If you
|
||||
want to mark a particular point annotation with an annotation view instead,
|
||||
omit this method or have it return `nil` for that annotation, then implement
|
||||
`-mapView:viewForAnnotation:`.
|
||||
|
||||
Static annotation images use less memory and draw more quickly than annotation
|
||||
views. On the other hand, annotation views are compatible with UIKit, Core
|
||||
Animation, and other Cocoa Touch frameworks.
|
||||
|
||||
@param mapView The map view that requested the annotation image.
|
||||
@param annotation The object representing the annotation that is about to be displayed.
|
||||
@return The image object to display for the specified annotation or `nil` if you want to display the default marker image.
|
||||
@param annotation The object representing the annotation that is about to be
|
||||
displayed.
|
||||
@return The annotation image object to display for the given annotation or
|
||||
`nil` if you want to display the default marker image or an annotation view.
|
||||
*/
|
||||
- (nullable MGLAnnotationImage *)mapView:(MGLMapView *)mapView imageForAnnotation:(id <MGLAnnotation>)annotation;
|
||||
|
||||
/**
|
||||
Returns the alpha value to use when rendering a shape annotation. Defaults to `1.0`.
|
||||
Returns the alpha value to use when rendering a shape annotation.
|
||||
|
||||
A value of 0.0 results in a completely transparent shape. A value of 1.0, the
|
||||
default, results in a completely opaque shape.
|
||||
|
||||
@param mapView The map view rendering the shape annotation.
|
||||
@param annotation The annotation being rendered.
|
||||
@return An alpha value between `0` and `1.0`.
|
||||
@return An alpha value between 0 and 1.0.
|
||||
*/
|
||||
- (CGFloat)mapView:(MGLMapView *)mapView alphaForShapeAnnotation:(MGLShape *)annotation;
|
||||
|
||||
/**
|
||||
Returns the stroke color to use when rendering a shape annotation. Defaults to the map view’s tint color.
|
||||
Returns the color to use when rendering the outline of a shape annotation.
|
||||
|
||||
The default stroke color is the map view’s tint color. If a pattern color is
|
||||
specified, the result is undefined.
|
||||
|
||||
@param mapView The map view rendering the shape annotation.
|
||||
@param annotation The annotation being rendered.
|
||||
@@ -167,95 +226,63 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
- (UIColor *)mapView:(MGLMapView *)mapView strokeColorForShapeAnnotation:(MGLShape *)annotation;
|
||||
|
||||
/**
|
||||
Returns the fill color to use when rendering a polygon annotation. Defaults to the map view’s tint color.
|
||||
Returns the color to use when rendering the fill of a polygon annotation.
|
||||
|
||||
The default fill color is the map view’s tint color. If a pattern color is
|
||||
specified, the result is undefined.
|
||||
|
||||
@param mapView The map view rendering the polygon annotation.
|
||||
@param annotation The annotation being rendered.
|
||||
@return A color to use for the polygon interior.
|
||||
@return The polygon’s interior fill color.
|
||||
*/
|
||||
- (UIColor *)mapView:(MGLMapView *)mapView fillColorForPolygonAnnotation:(MGLPolygon *)annotation;
|
||||
|
||||
/**
|
||||
Returns the line width to use when rendering a polyline annotation. Defaults to `3.0`.
|
||||
Returns the line width in points to use when rendering the outline of a
|
||||
polyline annotation.
|
||||
|
||||
By default, the polyline is outlined with a line 3.0 points wide.
|
||||
|
||||
@param mapView The map view rendering the polygon annotation.
|
||||
@param annotation The annotation being rendered.
|
||||
@return A line width for the polyline.
|
||||
@return A line width for the polyline, measured in points.
|
||||
*/
|
||||
- (CGFloat)mapView:(MGLMapView *)mapView lineWidthForPolylineAnnotation:(MGLPolyline *)annotation;
|
||||
|
||||
/**
|
||||
Returns a Boolean value indicating whether the annotation is able to display extra information in a callout bubble.
|
||||
|
||||
If the value returned is `YES`, a standard callout bubble is shown when the user taps a selected annotation. The callout uses the title and subtitle text from the associated annotation object. If there is no title text, though, the annotation will not show a callout. The callout also displays any custom callout views returned by the delegate for the left and right callout accessory views.
|
||||
|
||||
If the value returned is `NO`, the value of the title and subtitle strings are ignored.
|
||||
|
||||
@param mapView The map view that requested the annotation callout ability.
|
||||
@param annotation The object representing the annotation.
|
||||
@return A Boolean indicating whether the annotation should show a callout.
|
||||
*/
|
||||
- (BOOL)mapView:(MGLMapView *)mapView annotationCanShowCallout:(id <MGLAnnotation>)annotation;
|
||||
#pragma mark Managing Annotation Views
|
||||
|
||||
/**
|
||||
Returns a callout view to display for the specified annotation.
|
||||
Returns a view object to mark the given point annotation object on the map.
|
||||
|
||||
If this method is present in the delegate, it must return a new instance of a view dedicated to display the callout bubble. It will be configured by the map view. If this method is not present, or if it returns `nil`, a standard, two-line, bubble-like callout view is displayed by default.
|
||||
Implement this method to mark a point annotation with a view object. If you
|
||||
want to mark a particular point annotation with a static image instead, omit
|
||||
this method or have it return `nil` for that annotation, then implement
|
||||
`-mapView:imageForAnnotation:` instead.
|
||||
|
||||
@param mapView The map view that requested the callout view.
|
||||
@param annotation The object representing the annotation.
|
||||
@return A view conforming to the `MGLCalloutView` protocol, or `nil` to use the default callout view.
|
||||
Annotation views are compatible with UIKit, Core Animation, and other Cocoa
|
||||
Touch frameworks. On the other hand, static annotation images use less memory
|
||||
and draw more quickly than annotation views.
|
||||
|
||||
@param mapView The map view that requested the annotation view.
|
||||
@param annotation The object representing the annotation that is about to be
|
||||
displayed.
|
||||
@return The view object to display for the given annotation or `nil` if you
|
||||
want to display an annotation image instead.
|
||||
*/
|
||||
- (nullable UIView <MGLCalloutView> *)mapView:(MGLMapView *)mapView calloutViewForAnnotation:(id <MGLAnnotation>)annotation;
|
||||
- (nullable MGLAnnotationView *)mapView:(MGLMapView *)mapView viewForAnnotation:(id <MGLAnnotation>)annotation;
|
||||
|
||||
/**
|
||||
Returns the view to display on the left side of the standard callout bubble.
|
||||
Tells the delegate that one or more annotation views have been added and
|
||||
positioned on the map.
|
||||
|
||||
The default value is treated as if `nil`. The left callout view is typically used to display information about the annotation or to link to custom information provided by your application.
|
||||
This method is called just after the views are added to the map. You can
|
||||
implement this method to animate the addition of the annotation views.
|
||||
|
||||
If the view you specify is also a descendant of the `UIControl` class, you can use the map view's delegate to receive notifications when your control is tapped. If it does not descend from `UIControl`, your view is responsible for handling any touch events within its bounds.
|
||||
|
||||
@param mapView The map view presenting the annotation callout.
|
||||
@param annotation The object representing the annotation with the callout.
|
||||
@return The accessory view to display.
|
||||
@param mapView The map view to which the annotation views were added.
|
||||
@param annotationViews An array of `MGLAnnotationView` objects representing the
|
||||
views that were added.
|
||||
*/
|
||||
- (nullable UIView *)mapView:(MGLMapView *)mapView leftCalloutAccessoryViewForAnnotation:(id <MGLAnnotation>)annotation;
|
||||
|
||||
/**
|
||||
Returns the view to display on the right side of the standard callout bubble.
|
||||
|
||||
The default value is treated is if `nil`. The right callout view is typically used to link to more detailed information about the annotation. A common view to specify for this property is `UIButton` object whose type is set to `UIButtonTypeDetailDisclosure`.
|
||||
|
||||
If the view you specify is also a descendant of the `UIControl` class, you can use the map view's delegate to receive notifications when your control is tapped. If it does not descend from `UIControl`, your view is responsible for handling any touch events within its bounds.
|
||||
|
||||
@param mapView The map view presenting the annotation callout.
|
||||
@param annotation The object representing the annotation with the callout.
|
||||
@return The accessory view to display.
|
||||
*/
|
||||
- (nullable UIView *)mapView:(MGLMapView *)mapView rightCalloutAccessoryViewForAnnotation:(id <MGLAnnotation>)annotation;
|
||||
|
||||
#pragma mark Managing Annotations
|
||||
|
||||
/**
|
||||
Tells the delegate that the user tapped one of the annotation's accessory buttons.
|
||||
|
||||
Accessory views contain custom content and are positioned on either side of the annotation title text. If a view you specify is a descendant of the `UIControl` class, the map view calls this method as a convenience whenever the user taps your view. You can use this method to respond to taps and perform any actions associated with that control. For example, if your control displayed additional information about the annotation, you could use this method to present a modal panel with that information.
|
||||
|
||||
If your custom accessory views are not descendants of the `UIControl` class, the map view does not call this method.
|
||||
|
||||
@param mapView The map view containing the specified annotation.
|
||||
@param annotation The annotation whose button was tapped.
|
||||
@param control The control that was tapped.
|
||||
*/
|
||||
- (void)mapView:(MGLMapView *)mapView annotation:(id <MGLAnnotation>)annotation calloutAccessoryControlTapped:(UIControl *)control;
|
||||
|
||||
/**
|
||||
Tells the delegate that the user tapped on an annotation's callout view.
|
||||
|
||||
@param mapView The map view containing the specified annotation.
|
||||
@param annotation The annotation whose callout was tapped.
|
||||
*/
|
||||
- (void)mapView:(MGLMapView *)mapView tapOnCalloutForAnnotation:(id <MGLAnnotation>)annotation;
|
||||
- (void)mapView:(MGLMapView *)mapView didAddAnnotationViews:(NS_ARRAY_OF(MGLAnnotationView *) *)annotationViews;
|
||||
|
||||
#pragma mark Selecting Annotations
|
||||
|
||||
@@ -264,6 +291,10 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
You can use this method to track changes in the selection state of annotations.
|
||||
|
||||
If the annotation is associated with an annotation view, you can also implement
|
||||
`-mapView:didSelectAnnotationView:`, which is called immediately after this
|
||||
method is called.
|
||||
|
||||
@param mapView The map view containing the annotation.
|
||||
@param annotation The annotation that was selected.
|
||||
*/
|
||||
@@ -274,16 +305,25 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
You can use this method to track changes in the selection state of annotations.
|
||||
|
||||
If the annotation is associated with an annotation view, you can also implement
|
||||
`-mapView:didDeselectAnnotationView:`, which is called immediately after this
|
||||
method is called.
|
||||
|
||||
@param mapView The map view containing the annotation.
|
||||
@param annotation The annotation that was deselected.
|
||||
*/
|
||||
- (void)mapView:(MGLMapView *)mapView didDeselectAnnotation:(id <MGLAnnotation>)annotation;
|
||||
|
||||
|
||||
/**
|
||||
Tells the delegate that one of its annotation views was selected.
|
||||
|
||||
You can use this method to track changes in the selection state of annotation views.
|
||||
You can use this method to track changes in the selection state of annotation
|
||||
views.
|
||||
|
||||
This method is only called for annotation views. To track changes in the
|
||||
selection state of all annotations, including those associated with static
|
||||
annotation images, implement `-mapView:didSelectAnnotation:`, which is called
|
||||
immediately before this method is called.
|
||||
|
||||
@param mapView The map view containing the annotation.
|
||||
@param annotationView The annotation view that was selected.
|
||||
@@ -293,24 +333,158 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
/**
|
||||
Tells the delegate that one of its annotation views was deselected.
|
||||
|
||||
You can use this method to track changes in the selection state of annotation views.
|
||||
You can use this method to track changes in the selection state of annotation
|
||||
views.
|
||||
|
||||
This method is only called for annotation views. To track changes in the
|
||||
selection state of all annotations, including those associated with static
|
||||
annotation images, implement `-mapView:didDeselectAnnotation:`, which is called
|
||||
immediately before this method is called.
|
||||
|
||||
@param mapView The map view containing the annotation.
|
||||
@param annotationView The annotation view that was deselected.
|
||||
*/
|
||||
- (void)mapView:(MGLMapView *)mapView didDeselectAnnotationView:(MGLAnnotationView *)annotationView;
|
||||
|
||||
#pragma mark Managing Callout Views
|
||||
|
||||
/**
|
||||
Tells the delegate that one if its annotation views was dragged to a new coordinate.
|
||||
Returns a Boolean value indicating whether the annotation is able to display
|
||||
extra information in a callout bubble.
|
||||
|
||||
In order to make the new location persistent, you have to update the `coordinate` property of the associated annotation.
|
||||
This method is called after an annotation is selected, before any callout is
|
||||
displayed for the annotation.
|
||||
|
||||
@param mapView The map view containing the annotation view.
|
||||
@param annotationView The annotation view that was dragged.
|
||||
@param coordinate The coordinate that the annotation view was dropped on.
|
||||
If the return value is `YES`, a callout view is shown when the user taps on an
|
||||
annotation, selecting it. The default callout displays the annotation’s title
|
||||
and subtitle. You can add accessory views to either end of the callout by
|
||||
implementing the `-mapView:leftCalloutAccessoryViewForAnnotation:` and
|
||||
`-mapView:rightCalloutAccessoryViewForAnnotation:` methods. You can further
|
||||
customize the callout’s contents by implementing the
|
||||
`-mapView:calloutViewForAnnotation:` method.
|
||||
|
||||
If the return value is `NO`, or if this method is absent from the delegate, or
|
||||
if the annotation lacks a title, the annotation will not show a callout even
|
||||
when selected.
|
||||
|
||||
@param mapView The map view that has selected the annotation.
|
||||
@param annotation The object representing the annotation.
|
||||
@return A Boolean value indicating whether the annotation should show a
|
||||
callout.
|
||||
*/
|
||||
- (void)mapView:(MGLMapView *)mapView didDragAnnotationView:(MGLAnnotationView *)annotationView toCoordinate:(CLLocationCoordinate2D)coordinate;
|
||||
- (BOOL)mapView:(MGLMapView *)mapView annotationCanShowCallout:(id <MGLAnnotation>)annotation;
|
||||
|
||||
/**
|
||||
Returns a callout view to display for the given annotation.
|
||||
|
||||
If this method is present in the delegate, it must return a new instance of a
|
||||
view dedicated to display the callout. The returned view will be configured by
|
||||
the map view.
|
||||
|
||||
If this method is absent from the delegate, or if it returns `nil`, a standard,
|
||||
two-line, bubble-like callout view is displayed by default.
|
||||
|
||||
@param mapView The map view that requested the callout view.
|
||||
@param annotation The object representing the annotation.
|
||||
@return A view conforming to the `MGLCalloutView` protocol, or `nil` to use the
|
||||
default callout view.
|
||||
*/
|
||||
- (nullable UIView <MGLCalloutView> *)mapView:(MGLMapView *)mapView calloutViewForAnnotation:(id <MGLAnnotation>)annotation;
|
||||
|
||||
/**
|
||||
Returns the view to display on the left side of the standard callout bubble.
|
||||
|
||||
The left callout view is typically used to convey information about the
|
||||
annotation or to link to custom information provided by your application.
|
||||
|
||||
If the view you specify is a descendant of the `UIControl` class, you can use
|
||||
the map view’s delegate to receive notifications when your control is tapped,
|
||||
by implementing the `-mapView:annotation:calloutAccessoryControlTapped:`
|
||||
method. If the view you specify does not descend from `UIControl`, your view is
|
||||
responsible for handling any touch events within its bounds.
|
||||
|
||||
If this method is absent from the delegate, or if it returns `nil`, the
|
||||
standard callout view has no accessory view on its left side. The return value
|
||||
of this method is ignored if `-mapView:calloutViewForAnnotation:` is present in
|
||||
the delegate.
|
||||
|
||||
To display a view on the callout’s right side, implement the
|
||||
`-mapView:rightCalloutAccessoryViewForAnnotation:` method.
|
||||
|
||||
@param mapView The map view presenting the annotation callout.
|
||||
@param annotation The object representing the annotation with the callout.
|
||||
@return The accessory view to display.
|
||||
*/
|
||||
- (nullable UIView *)mapView:(MGLMapView *)mapView leftCalloutAccessoryViewForAnnotation:(id <MGLAnnotation>)annotation;
|
||||
|
||||
/**
|
||||
Returns the view to display on the right side of the standard callout bubble.
|
||||
|
||||
The right callout view is typically used to convey information about the
|
||||
annotation or to link to custom information provided by your application.
|
||||
|
||||
If the view you specify is a descendant of the `UIControl` class, you can use
|
||||
the map view’s delegate to receive notifications when your control is tapped,
|
||||
by implementing the `-mapView:annotation:calloutAccessoryControlTapped:`
|
||||
method. If the view you specify does not descend from `UIControl`, your view is
|
||||
responsible for handling any touch events within its bounds.
|
||||
|
||||
If this method is absent from the delegate, or if it returns `nil`, the
|
||||
standard callout view has no accessory view on its right side. The return value
|
||||
of this method is ignored if `-mapView:calloutViewForAnnotation:` is present in
|
||||
the delegate.
|
||||
|
||||
To display a view on the callout’s left side, implement the
|
||||
`-mapView:leftCalloutAccessoryViewForAnnotation:` method.
|
||||
|
||||
@param mapView The map view presenting the annotation callout.
|
||||
@param annotation The object representing the annotation with the callout.
|
||||
@return The accessory view to display.
|
||||
*/
|
||||
- (nullable UIView *)mapView:(MGLMapView *)mapView rightCalloutAccessoryViewForAnnotation:(id <MGLAnnotation>)annotation;
|
||||
|
||||
/**
|
||||
Tells the delegate that the user tapped one of the accessory controls in the
|
||||
annotation’s callout view.
|
||||
|
||||
In a standard callout view, accessory views contain custom content and are
|
||||
positioned on either side of the annotation title text. If an accessory view
|
||||
you specify is a descendant of the `UIControl` class, the map view calls this
|
||||
method as a convenience whenever the user taps your view. You can use this
|
||||
method to respond to taps and perform any actions associated with that control.
|
||||
For example, if your control displays additional information about the
|
||||
annotation, you could use this method to present a modal panel with that
|
||||
information.
|
||||
|
||||
If your custom accessory views are not descendants of the `UIControl` class,
|
||||
the map view does not call this method. If the annotation has a custom callout
|
||||
view via the `-mapView:calloutViewForAnnotation:` method, you can specify the
|
||||
custom accessory views using the `MGLCalloutView` protocol’s
|
||||
`leftAccessoryView` and `rightAccessoryView` properties.
|
||||
|
||||
@param mapView The map view containing the specified annotation.
|
||||
@param annotation The annotation whose accessory view was tapped.
|
||||
@param control The control that was tapped.
|
||||
*/
|
||||
- (void)mapView:(MGLMapView *)mapView annotation:(id <MGLAnnotation>)annotation calloutAccessoryControlTapped:(UIControl *)control;
|
||||
|
||||
/**
|
||||
Tells the delegate that the user tapped on an annotation’s callout view.
|
||||
|
||||
This method is called when the user taps on the body of the callout view, as
|
||||
opposed to the callout’s left or right accessory view. If the annotation has a
|
||||
custom callout view via the `-mapView:calloutViewForAnnotation:` method, this
|
||||
method is only called whenever the callout view calls its delegate’s
|
||||
`-[MGLCalloutViewDelegate calloutViewTapped:]` method.
|
||||
|
||||
If this method is present on the delegate, the standard callout view’s body
|
||||
momentarily highlights when the user taps it, whether or not this method does
|
||||
anything in response to the tap.
|
||||
|
||||
@param mapView The map view containing the specified annotation.
|
||||
@param annotation The annotation whose callout was tapped.
|
||||
*/
|
||||
- (void)mapView:(MGLMapView *)mapView tapOnCalloutForAnnotation:(id <MGLAnnotation>)annotation;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
@@ -5,6 +5,9 @@ extern const CGSize MGLAnnotationAccessibilityElementMinimumSize;
|
||||
|
||||
@interface MGLMapView (Internal)
|
||||
|
||||
/// Currently shown popover representing the selected annotation.
|
||||
@property (nonatomic) UIView<MGLCalloutView> *calloutViewForSelectedAnnotation;
|
||||
|
||||
/** Triggers another render pass even when it is not necessary. */
|
||||
- (void)setNeedsGLDisplay;
|
||||
|
||||
|
||||
@@ -3,6 +3,17 @@
|
||||
|
||||
static NSString * const MGLTestAnnotationReuseIdentifer = @"MGLTestAnnotationReuseIdentifer";
|
||||
|
||||
@interface MGLAnnotationView (Test)
|
||||
@property (nonatomic) MGLMapView *mapView;
|
||||
@property (nonatomic, readwrite) MGLAnnotationViewDragState dragState;
|
||||
|
||||
- (void)setDragState:(MGLAnnotationViewDragState)dragState;
|
||||
@end
|
||||
|
||||
@interface MGLMapView (Test)
|
||||
@property (nonatomic) UIView<MGLCalloutView> *calloutViewForSelectedAnnotation;
|
||||
@end
|
||||
|
||||
@interface MGLTestAnnotation : NSObject <MGLAnnotation>
|
||||
@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
|
||||
@end
|
||||
@@ -10,6 +21,19 @@ static NSString * const MGLTestAnnotationReuseIdentifer = @"MGLTestAnnotationReu
|
||||
@implementation MGLTestAnnotation
|
||||
@end
|
||||
|
||||
@interface MGLTestCalloutView: UIView<MGLCalloutView>
|
||||
@property (nonatomic) BOOL didCallDismissCalloutAnimated;
|
||||
@end
|
||||
|
||||
@implementation MGLTestCalloutView
|
||||
|
||||
- (void)dismissCalloutAnimated:(BOOL)animated
|
||||
{
|
||||
_didCallDismissCalloutAnimated = YES;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@interface MGLAnnotationViewTests : XCTestCase <MGLMapViewDelegate>
|
||||
@property (nonatomic) XCTestExpectation *expectation;
|
||||
@property (nonatomic) MGLMapView *mapView;
|
||||
@@ -28,15 +52,21 @@ static NSString * const MGLTestAnnotationReuseIdentifer = @"MGLTestAnnotationReu
|
||||
- (void)testAnnotationView
|
||||
{
|
||||
_expectation = [self expectationWithDescription:@"annotation property"];
|
||||
|
||||
|
||||
MGLTestAnnotation *annotation = [[MGLTestAnnotation alloc] init];
|
||||
[_mapView addAnnotation:annotation];
|
||||
|
||||
|
||||
[self waitForExpectationsWithTimeout:1 handler:nil];
|
||||
|
||||
|
||||
XCTAssert(_mapView.annotations.count == 1, @"number of annotations should be 1");
|
||||
XCTAssertNotNil(_annotationView.annotation, @"annotation property should not be nil");
|
||||
|
||||
XCTAssertNotNil(_annotationView.mapView, @"mapView property should not be nil");
|
||||
|
||||
MGLTestCalloutView *testCalloutView = [[MGLTestCalloutView alloc] init];
|
||||
_mapView.calloutViewForSelectedAnnotation = testCalloutView;
|
||||
_annotationView.dragState = MGLAnnotationViewDragStateStarting;
|
||||
XCTAssertTrue(testCalloutView.didCallDismissCalloutAnimated, @"callout view was not dismissed");
|
||||
|
||||
[_mapView removeAnnotation:_annotationView.annotation];
|
||||
|
||||
XCTAssert(_mapView.annotations.count == 0, @"number of annotations should be 0");
|
||||
@@ -54,9 +84,12 @@ static NSString * const MGLTestAnnotationReuseIdentifer = @"MGLTestAnnotationReu
|
||||
|
||||
_annotationView = annotationView;
|
||||
|
||||
[_expectation fulfill];
|
||||
|
||||
return annotationView;
|
||||
}
|
||||
|
||||
- (void)mapView:(MGLMapView *)mapView didAddAnnotationViews:(NSArray<MGLAnnotationView *> *)annotationViews
|
||||
{
|
||||
[_expectation fulfill];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
52
platform/ios/test/MGLNSDataAdditionsTests.m
Normal file
52
platform/ios/test/MGLNSDataAdditionsTests.m
Normal file
@@ -0,0 +1,52 @@
|
||||
#import <XCTest/XCTest.h>
|
||||
|
||||
#import "../../darwin/src/NSData+MGLAdditions.h"
|
||||
|
||||
@interface MGLNSDataAdditionsTests : XCTestCase
|
||||
@end
|
||||
|
||||
@implementation MGLNSDataAdditionsTests
|
||||
|
||||
- (void)setUp {
|
||||
[super setUp];
|
||||
}
|
||||
|
||||
- (void)testCompressDecompress
|
||||
{
|
||||
NSArray *originalArray = [self mockDataWithCount:180];
|
||||
|
||||
NSData *originalData = [NSJSONSerialization dataWithJSONObject:originalArray options:0 error:nil];
|
||||
|
||||
NSData *compressedData = [originalData mgl_compressedData];
|
||||
NSData *decompressedData = [compressedData mgl_decompressedData];
|
||||
|
||||
NSArray *decompressedArray = [NSJSONSerialization JSONObjectWithData:decompressedData options:0 error:nil];
|
||||
|
||||
XCTAssertTrue([originalArray isEqualToArray:decompressedArray], @"originalArray and decompressedArray should be equal");
|
||||
}
|
||||
|
||||
- (NSArray *)mockDataWithCount:(NSUInteger)count
|
||||
{
|
||||
NSMutableArray *array = [NSMutableArray array];
|
||||
|
||||
for (NSUInteger i=0;i<count;i++)
|
||||
{
|
||||
[array addObject:@{@"lat": @([self safeValueBetween:-90 and:90]),
|
||||
@"lng": @([self safeValueBetween:-180 and:180]),
|
||||
@"timestamp": @((floor([NSDate date].timeIntervalSince1970) * 100) / 100)}];
|
||||
}
|
||||
|
||||
return array;
|
||||
}
|
||||
|
||||
- (double)safeValueBetween:(double)lowerBound and:(double)upperBound
|
||||
{
|
||||
return floor([self randomBetween:lowerBound and:upperBound] * 100 ) / 100;
|
||||
}
|
||||
|
||||
- (double)randomBetween:(double)lowerBound and:(double)upperBound
|
||||
{
|
||||
return lowerBound * drand48() + upperBound * drand48();
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
* Right-clicking to open MGLMapView’s context menu no longer prevents the user from subsequently panning the map by clicking and dragging. ([#5593](https://github.com/mapbox/mapbox-gl-native/pull/5593))
|
||||
* Replaced the wireframe debug mask with an overdraw visualization debug mask to match Mapbox GL JS’s overdraw inspector. ([#5403](https://github.com/mapbox/mapbox-gl-native/pull/5403))
|
||||
* Improved the design of the generated API documentation. ([#5306](https://github.com/mapbox/mapbox-gl-native/pull/5306))
|
||||
|
||||
## 0.2.0
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
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, or Interface Builder. It 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 alt="" src="https://raw.githubusercontent.com/mapbox/mapbox-gl-native/master/platform/macos/screenshot.png" width="645">
|
||||
<img alt="Mapbox macOS SDK screenshot" src="screenshot.png" width="645">
|
||||
|
||||
For setup information, consult the README.md that comes with this documentation. 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.
|
||||
|
||||
|
||||
@@ -32,6 +32,8 @@ sed -n -e '/^## /{' -e ':a' -e 'n' -e '/^##/q' -e 'p' -e 'ba' -e '}' platform/ma
|
||||
rm -rf ${OUTPUT}
|
||||
mkdir -p ${OUTPUT}
|
||||
|
||||
cp platform/macos/screenshot.png "${OUTPUT}"
|
||||
|
||||
jazzy \
|
||||
--config platform/macos/jazzy.yml \
|
||||
--sdk macosx \
|
||||
@@ -39,6 +41,7 @@ jazzy \
|
||||
--github-file-prefix https://github.com/mapbox/mapbox-gl-native/tree/${BRANCH} \
|
||||
--module-version ${SHORT_VERSION} \
|
||||
--readme ${README} \
|
||||
--theme platform/darwin/docs/theme \
|
||||
--output ${OUTPUT}
|
||||
# https://github.com/realm/jazzy/issues/411
|
||||
find ${OUTPUT} -name *.html -exec \
|
||||
|
||||
@@ -40,10 +40,12 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
/**
|
||||
Tells the delegate that the viewpoint depicted by the map view is changing.
|
||||
|
||||
This method is called as the currently displayed map camera changes due to
|
||||
animation. During movement, this method may be called many times to report
|
||||
updates to the viewpoint. Therefore, your implementation of this method should
|
||||
be as lightweight as possible to avoid affecting performance.
|
||||
This method is called as the currently displayed map camera changes as part of
|
||||
an animation, whether due to a user gesture or due to a call to a method such
|
||||
as `-[MGLMapView setCamera:animated:]`. During the animation, this method may
|
||||
be called many times to report updates to the viewpoint. Therefore, your
|
||||
implementation of this method should be as lightweight as possible to avoid
|
||||
affecting performance.
|
||||
|
||||
@param mapView The map view whose viewpoint is changing.
|
||||
*/
|
||||
@@ -54,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
changing.
|
||||
|
||||
This method is called whenever the currently displayed map camera has finished
|
||||
changing.
|
||||
changing, after any calls to `-mapViewRegionIsChanging:` due to animation.
|
||||
|
||||
@param mapView The map view whose viewpoint has changed.
|
||||
@param animated Whether the change caused an animated effect on the map.
|
||||
@@ -85,10 +87,34 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
- (void)mapViewWillStartRenderingMap:(MGLMapView *)mapView;
|
||||
- (void)mapViewDidFinishRenderingMap:(MGLMapView *)mapView fullyRendered:(BOOL)fullyRendered;
|
||||
|
||||
/**
|
||||
Tells the delegate that the map view is about to redraw.
|
||||
|
||||
This method is called any time the map view needs to redraw due to a change in
|
||||
the viewpoint or style property transition. This method may be called very
|
||||
frequently, even moreso than `-mapViewRegionIsChanging:`. Therefore, your
|
||||
implementation of this method should be as lightweight as possible to avoid
|
||||
affecting performance.
|
||||
|
||||
@param mapView The map view that is about to redraw.
|
||||
*/
|
||||
- (void)mapViewWillStartRenderingFrame:(MGLMapView *)mapView;
|
||||
|
||||
/**
|
||||
Tells the delegate that the map view has just redrawn.
|
||||
|
||||
This method is called any time the map view needs to redraw due to a change in
|
||||
the viewpoint or style property transition. This method may be called very
|
||||
frequently, even moreso than `-mapViewRegionIsChanging:`. Therefore, your
|
||||
implementation of this method should be as lightweight as possible to avoid
|
||||
affecting performance.
|
||||
|
||||
@param mapView The map view that has just redrawn.
|
||||
*/
|
||||
- (void)mapViewDidFinishRenderingFrame:(MGLMapView *)mapView fullyRendered:(BOOL)fullyRendered;
|
||||
|
||||
#pragma mark Managing the Display of Annotations
|
||||
#pragma mark Managing the Appearance of Annotations
|
||||
|
||||
/**
|
||||
Returns an annotation image object to mark the given point annotation object on
|
||||
@@ -129,7 +155,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
/**
|
||||
Returns the color to use when rendering the fill of a polygon annotation.
|
||||
|
||||
The default fill color is selected menu item color. If a pattern color is
|
||||
The default fill color is the selected menu item color. If a pattern color is
|
||||
specified, the result is undefined.
|
||||
|
||||
@param mapView The map view rendering the polygon annotation.
|
||||
@@ -172,7 +198,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
*/
|
||||
- (void)mapView:(MGLMapView *)mapView didDeselectAnnotation:(id <MGLAnnotation>)annotation;
|
||||
|
||||
#pragma mark Displaying Information About Annotations
|
||||
#pragma mark Managing Callout Popovers
|
||||
|
||||
/**
|
||||
Returns a Boolean value indicating whether the annotation is able to display
|
||||
@@ -182,13 +208,13 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
displayed for the annotation.
|
||||
|
||||
If the return value is `YES`, a callout popover is shown when the user clicks
|
||||
on a selected annotation. The default callout displays the annotation’s title
|
||||
and subtitle. You can customize the popover’s contents by implementing the
|
||||
`-mapView:calloutViewControllerForAnnotation:` method.
|
||||
on an annotation, selecting it. The default callout displays the annotation’s
|
||||
title and subtitle. You can customize the popover’s contents by implementing
|
||||
the `-mapView:calloutViewControllerForAnnotation:` method.
|
||||
|
||||
If the return value is `NO`, or if this method is unimplemented, or if the
|
||||
annotation lacks a title, the annotation will not show a callout even when
|
||||
selected.
|
||||
If the return value is `NO`, or if this method is absent from the delegate, or
|
||||
if the annotation lacks a title, the annotation will not show a callout even
|
||||
when selected.
|
||||
|
||||
@param mapView The map view that has selected the annotation.
|
||||
@param annotation The object representing the annotation.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "compression.hpp"
|
||||
#include <mbgl/util/compression.hpp>
|
||||
|
||||
#include <zlib.h>
|
||||
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace mbgl {
|
||||
namespace util {
|
||||
|
||||
std::string compress(const std::string &raw);
|
||||
std::string decompress(const std::string &raw);
|
||||
|
||||
} // namespace util
|
||||
} // namespace mbgl
|
||||
Reference in New Issue
Block a user