From 49d855769b0ac710d6e93285e90cb8fb75940f8f Mon Sep 17 00:00:00 2001 From: Nicki Dlugash Date: Mon, 14 Sep 2015 15:55:42 -0400 Subject: [PATCH 1/5] moved styles to v1.1.0 --- styles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles b/styles index 19dde3cb1..014e36833 160000 --- a/styles +++ b/styles @@ -1 +1 @@ -Subproject commit 19dde3cb1c36fe5f42dafc78c806fd7aca98126c +Subproject commit 014e36833420c81b29bec816b479ea61e94821d4 From f1edf1043bce36d7841ae72233353563a90aed81 Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Thu, 3 Sep 2015 17:01:46 -0400 Subject: [PATCH 2/5] fix circle clipping bug https://github.com/mapbox/mapbox-gl-js/commit/91d2e0ee5cf4ed3811804ef40b1696f93de74410 --- src/mbgl/renderer/circle_bucket.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mbgl/renderer/circle_bucket.cpp b/src/mbgl/renderer/circle_bucket.cpp index a6a439d86..ae8eeef9d 100644 --- a/src/mbgl/renderer/circle_bucket.cpp +++ b/src/mbgl/renderer/circle_bucket.cpp @@ -35,11 +35,15 @@ bool CircleBucket::hasData() const { } void CircleBucket::addGeometry(const GeometryCollection& geometryCollection) { + const int extent = 4096; for (auto& circle : geometryCollection) { for(auto & geometry : circle) { auto x = geometry.x; auto y = geometry.y; + // Do not include points that are outside the tile boundaries. + if (x < 0 || x >= extent || y < 0 || y >= extent) continue; + // this geometry will be of the Point type, and we'll derive // two triangles from it. // From 1b87232bec8d7173ed2f5d666b49ebc36a3b8135 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 15 Sep 2015 10:35:13 -0700 Subject: [PATCH 3/5] [core] Update test-suite --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8f13d884a..2b10196a5 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ ], "devDependencies": { "aws-sdk": "^2.1.47", - "mapbox-gl-test-suite": "git+https://github.com/mapbox/mapbox-gl-test-suite.git#6cfd7eb20de77018a7f10770f56df9ce1f8a76ac", + "mapbox-gl-test-suite": "git+https://github.com/mapbox/mapbox-gl-test-suite.git#592540ebf822fd2e3cfdebbfabce92c1f5ef5b10", "request": "^2.61.0", "tape": "^4.2.0" }, From 4dce45ffc660fc41220c1d2cbb94962ed114e633 Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Fri, 10 Jul 2015 15:31:06 +0200 Subject: [PATCH 4/5] [Android] add instructions to install Android Support Repository [skip ci] --- INSTALL.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/INSTALL.md b/INSTALL.md index fcc5d90c6..4c39cc4cc 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -270,6 +270,10 @@ Install [Android Studio](https://developer.android.com/sdk/installing/studio.htm brew cask install android-studio android +In the Android SDK Manager also select and install "Android Support Repository" and "Android Support Library" from "Extras": + +![image](https://cloud.githubusercontent.com/assets/98601/9915837/289f398e-5c6e-11e5-9a84-ed4d08d52d1f.png) + By default, the SDK will be installed to `/usr/local/opt/android-sdk`. If you open Android Studio at this point, you may get an error message telling you that it can't find a JVM, it's because you installed a custom Java VM from Oracle. Follow [these instructions](http://tools.android.com/recent/androidstudio1rc3_releasecandidate3released) to start Android Studio. You'll wind up setting these environment variables in your .bash_profile or similar: echo "export ANDROID_HOME=`brew --prefix android-sdk`" >> .bash_profile From 79dc20808fd4ed72922742fa650a0dd1bbdc9038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Tue, 8 Sep 2015 14:21:03 -0700 Subject: [PATCH 5/5] Prefix user defaults in iosapp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We technically don’t need to, but the demo app should practice good hygiene since we expect developers to copy from it. --- ios/app/MBXViewController.mm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm index d94e41b5f..bb35a0791 100644 --- a/ios/app/MBXViewController.mm +++ b/ios/app/MBXViewController.mm @@ -31,9 +31,9 @@ static NSUInteger const kStyleVersion = 8; if (self == [MBXViewController class]) { [[NSUserDefaults standardUserDefaults] registerDefaults:@{ - @"userTrackingMode": @(MGLUserTrackingModeNone), - @"showsUserLocation": @NO, - @"debug": @NO, + @"MBXUserTrackingMode": @(MGLUserTrackingModeNone), + @"MBXShowsUserLocation": @NO, + @"MBXDebug": @NO, }]; } } @@ -91,10 +91,10 @@ static NSUInteger const kStyleVersion = 8; { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSData *archivedCamera = [NSKeyedArchiver archivedDataWithRootObject:self.mapView.camera]; - [defaults setObject:archivedCamera forKey:@"camera"]; - [defaults setInteger:self.mapView.userTrackingMode forKey:@"userTrackingMode"]; - [defaults setBool:self.mapView.showsUserLocation forKey:@"showsUserLocation"]; - [defaults setBool:self.mapView.debugActive forKey:@"debug"]; + [defaults setObject:archivedCamera forKey:@"MBXCamera"]; + [defaults setInteger:self.mapView.userTrackingMode forKey:@"MBXUserTrackingMode"]; + [defaults setBool:self.mapView.showsUserLocation forKey:@"MBXShowsUserLocation"]; + [defaults setBool:self.mapView.debugActive forKey:@"MBXDebug"]; [defaults synchronize]; } } @@ -103,21 +103,21 @@ static NSUInteger const kStyleVersion = 8; { if (self.mapView) { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSData *archivedCamera = [defaults objectForKey:@"camera"]; + NSData *archivedCamera = [defaults objectForKey:@"MBXCamera"]; MGLMapCamera *camera = archivedCamera ? [NSKeyedUnarchiver unarchiveObjectWithData:archivedCamera] : nil; if (camera) { self.mapView.camera = camera; } - NSInteger uncheckedTrackingMode = [defaults integerForKey:@"userTrackingMode"]; + NSInteger uncheckedTrackingMode = [defaults integerForKey:@"MBXUserTrackingMode"]; if (uncheckedTrackingMode >= 0 && (NSUInteger)uncheckedTrackingMode >= MGLUserTrackingModeNone && (NSUInteger)uncheckedTrackingMode <= MGLUserTrackingModeFollowWithCourse) { self.mapView.userTrackingMode = (MGLUserTrackingMode)uncheckedTrackingMode; } - self.mapView.showsUserLocation = [defaults boolForKey:@"showsUserLocation"]; - self.mapView.debugActive = [defaults boolForKey:@"debug"]; + self.mapView.showsUserLocation = [defaults boolForKey:@"MBXShowsUserLocation"]; + self.mapView.debugActive = [defaults boolForKey:@"MBXDebug"]; } }