tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15 from maptiler/open-geo-uris

Browse Source 
[macos] Added open geo url support to the macos app.
This commit is contained in:
Petr Pokorny
2021-02-03 13:56:15 +01:00
committed by GitHub
parent 2f480bf8ee 276bae52e2
commit cd8d564679
3 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/ios/platform/darwin/test/MGLMapSnapshotterTests.m
View File

@@ -137,7 +137,7 @@ MGLImage *MGLImageFromCurrentContext() {
}
[completionExpectation fulfill];
}];
[self waitForExpectations:@[self.styleLoadingExpectation, completionExpectation] timeout:5 enforceOrder:YES];
[self waitForExpectations:@[self.styleLoadingExpectation, completionExpectation] timeout:10 enforceOrder:YES];
}
- (void)testRuntimeStyling {

38
platform/ios/platform/macos/app/AppDelegate.m
View File

@@ -157,18 +157,36 @@ NSString * const MGLLastMapDebugMaskDefaultsKey = @"MGLLastMapDebugMask";
#pragma mark Services
- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent {
// geo:29.95,-90.066667,3000
// geo:29.95,-90.066667?z=14
// mapboxgl://?center=29.95,-90.066667&zoom=14&bearing=45&pitch=30
NSURL *url = [NSURL URLWithString:[event paramDescriptorForKeyword:keyDirectObject].stringValue];
NSURLComponents *components = [NSURLComponents componentsWithString:[event paramDescriptorForKeyword:keyDirectObject].stringValue];
BOOL isGLURL = [components.scheme isEqualToString:@"mapboxgl"];
BOOL isGeoURL = [components.scheme isEqualToString:@"geo"];
NSString *centerString;
NSMutableDictionary<NSString *, NSString *> *params = [[NSMutableDictionary alloc] init];
for (NSString *param in [url.query componentsSeparatedByString:@"&"]) {
NSArray *parts = [param componentsSeparatedByString:@"="];
if (parts.count >= 2) {
params[parts[0]] = [parts[1] stringByRemovingPercentEncoding];
}
for (NSURLQueryItem *queryItem in components.queryItems) {
params[queryItem.name] = queryItem.value;
}
if (isGLURL) {
centerString = params[@"center"];
} else if (isGeoURL) {
NSArray<NSString *> *parsedPath = [components.path componentsSeparatedByString:@";"];
centerString = parsedPath.firstObject;
for (NSString *param in [parsedPath subarrayWithRange:NSMakeRange(1, parsedPath.count - 1)]) {
NSArray *parts = [param componentsSeparatedByString:@"="];
if (parts.count >= 2) {
params[parts[0]] = parts[1];
}
}
}
MGLMapCamera *camera = [MGLMapCamera camera];
NSString *zoomLevelString = params[@"zoom"];
NSString *zoomLevelString = params[@"zoom"] ?: params[@"z"];
self.pendingZoomLevel = zoomLevelString.length ? zoomLevelString.doubleValue : -1;
NSString *directionString = params[@"bearing"];
@@ -176,13 +194,15 @@ NSString * const MGLLastMapDebugMaskDefaultsKey = @"MGLLastMapDebugMask";
camera.heading = directionString.doubleValue;
}
NSString *centerString = params[@"center"];
if (centerString) {
NSArray *coordinateValues = [centerString componentsSeparatedByString:@","];
if (coordinateValues.count == 2) {
if (coordinateValues.count >= 2) {
camera.centerCoordinate = CLLocationCoordinate2DMake([coordinateValues[0] doubleValue],
[coordinateValues[1] doubleValue]);
}
if (coordinateValues.count == 3) {
camera.altitude = [coordinateValues[2] doubleValue];
}
}
NSString *pitchString = params[@"pitch"];

10
platform/ios/platform/macos/app/Info.plist
View File

@@ -43,6 +43,16 @@
<string>mapboxgl</string>
</array>
</dict>
<dict>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>CFBundleURLName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleURLSchemes</key>
<array>
<string>geo</string>
</array>
</dict>
</array>
<key>CFBundleVersion</key>
<string>15256</string>