Skip to content

Commit

Permalink
Upgrade MapLibre for iOS from 5.10.0 to 5.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@roblabs
roblabs committed Mar 12, 2021
1 parent 6ceda53 commit 7b1a711
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 27 deletions.
26 changes: 9 additions & 17 deletions openmaptiles-ios-demo.xcodeproj/project.pbxproj
View file
Expand Up @@ -15,9 +15,8 @@
D717E7E825C63711004C4F31 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D717E7E425C63711004C4F31 /* AppDelegate.swift */; };
D71B679A1C9C827300C6AA6A /* glyphs in Resources */ = {isa = PBXBuildFile; fileRef = D71B67971C9C827300C6AA6A /* glyphs */; };
D71B679B1C9C827300C6AA6A /* sprites in Resources */ = {isa = PBXBuildFile; fileRef = D71B67981C9C827300C6AA6A /* sprites */; };
D76E35A025C0E72B004CCEBF /* MapboxMobileEvents in Frameworks */ = {isa = PBXBuildFile; productRef = D76E359F25C0E72B004CCEBF /* MapboxMobileEvents */; };
D76E35A225C0E72B004CCEBF /* Mapbox in Frameworks */ = {isa = PBXBuildFile; productRef = D76E35A125C0E72B004CCEBF /* Mapbox */; };
D7AAD8CF2395EB1D002BA6A3 /* OSM2VectorTilesUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7AAD8CE2395EB1D002BA6A3 /* OSM2VectorTilesUITests.swift */; };
D7DEFCC625FBF52F003CC631 /* Mapbox in Frameworks */ = {isa = PBXBuildFile; productRef = D7DEFCC525FBF52F003CC631 /* Mapbox */; };
FD137E021E08E259005C1849 /* styles in Resources */ = {isa = PBXBuildFile; fileRef = FD137E011E08E259005C1849 /* styles */; };
FD137E041E08E67E005C1849 /* geography-class.osm2vectortiles in Resources */ = {isa = PBXBuildFile; fileRef = FD137E031E08E67E005C1849 /* geography-class.osm2vectortiles */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -72,8 +71,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D76E35A225C0E72B004CCEBF /* Mapbox in Frameworks */,
D76E35A025C0E72B004CCEBF /* MapboxMobileEvents in Frameworks */,
D7DEFCC625FBF52F003CC631 /* Mapbox in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -171,8 +169,7 @@
);
name = GeographyClass;
packageProductDependencies = (
D76E359F25C0E72B004CCEBF /* MapboxMobileEvents */,
D76E35A125C0E72B004CCEBF /* Mapbox */,
D7DEFCC525FBF52F003CC631 /* Mapbox */,
);
productName = OSM2VectorTiles;
productReference = 4C5BF3151C84DDF5000EE0E1 /* GeographyClass.app */;
Expand Down Expand Up @@ -229,7 +226,7 @@
);
mainGroup = 4C5BF30C1C84DDF5000EE0E1;
packageReferences = (
D76E359E25C0E72B004CCEBF /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */,
D7DEFCC425FBF52F003CC631 /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */,
);
productRefGroup = 4C5BF3161C84DDF5000EE0E1 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -563,25 +560,20 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
D76E359E25C0E72B004CCEBF /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */ = {
D7DEFCC425FBF52F003CC631 /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/roblabs/maplibre-gl-native-distribution";
repositoryURL = "https://github.com/maplibre/maplibre-gl-native-distribution.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 5.10.0;
minimumVersion = 5.11.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
D76E359F25C0E72B004CCEBF /* MapboxMobileEvents */ = {
D7DEFCC525FBF52F003CC631 /* Mapbox */ = {
isa = XCSwiftPackageProductDependency;
package = D76E359E25C0E72B004CCEBF /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */;
productName = MapboxMobileEvents;
};
D76E35A125C0E72B004CCEBF /* Mapbox */ = {
isa = XCSwiftPackageProductDependency;
package = D76E359E25C0E72B004CCEBF /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */;
package = D7DEFCC425FBF52F003CC631 /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */;
productName = Mapbox;
};
/* End XCSwiftPackageProductDependency section */
Expand Down
8 changes: 4 additions & 4 deletions openmaptiles-ios-demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Expand Up @@ -2,12 +2,12 @@
"object": {
"pins": [
{
"package": "maplibre-gl-native",
"repositoryURL": "https://github.com/roblabs/maplibre-gl-native-distribution",
"package": "MapLibre GL Native",
"repositoryURL": "https://github.com/maplibre/maplibre-gl-native-distribution.git",
"state": {
"branch": null,
"revision": "7eaf6a9741e1a2bd698c4dfc4184cfa138f2aba3",
"version": "5.10.0"
"revision": "dc28d9ad9e1b5c52cdeab26e2fe1781db4974e9a",
"version": "5.11.0"
}
}
]
Expand Down
16 changes: 10 additions & 6 deletions readme.md
View file
Expand Up @@ -76,23 +76,25 @@ You can Soft Proof your tiles before they are installed into mobile by using [Ti
* Discussion on whether `.pbf` can be compressed when using `tippecanoe`: [mapbox / tippecanoe #582](https://github.com/mapbox/tippecanoe/issues/582)
* `tippecanoe -pC --maximum-zoom=7 -o poly.pC.mbtiles poly.geojson`

### Sample Tile JSON
### Sample Tile JSON & Styles

[Tile JSON][tileJSON] with GitHub served `.pbf`
[Tile JSON][tileJSON] with GitHub served `.pbf`. Choose either the Tile JSON or Mapbox Style

* [geography-class.GitHub.json][geography-class.GitHub.json]
* [tileJSON/geography-class.GitHub.json][tileJSON/geography-class.GitHub.json]
* [styles/geography-class.GitHub.json][styles/geography-class.GitHub.json]


Locally served `.pbf`

* See the sample Tile JSON [geography-class.localhost.json][geography-class.localhost.json]
* See the sample Tile JSON [tileJSON/geography-class.localhost.json][tileJSON/geography-class.localhost.json]
* useful for use with [Maputnik][Maputnik] or [Fresco][Fresco]
* also an example to test your web server is serving up proper uncompressed `.pbf`
* `wget --spider http://localhost:5000/geography-class.osm2vectortiles/0/0/0.pbf`

[tileJSON]: https://github.com/mapbox/tilejson-spec/tree/master/2.2.0#2-file-format
[geography-class.localhost.json]: https://raw.githubusercontent.com/roblabs/openmaptiles-ios-demo/master/OSM2VectorTiles/tileJSON/geography-class.localhost.json
[geography-class.GitHub.json]: https://raw.githubusercontent.com/roblabs/openmaptiles-ios-demo/master/OSM2VectorTiles/tileJSON/geography-class.GitHub.json
[tileJSON/geography-class.localhost.json]: https://raw.githubusercontent.com/roblabs/openmaptiles-ios-demo/master/OSM2VectorTiles/tileJSON/geography-class.localhost.json
[tileJSON/geography-class.GitHub.json]: https://raw.githubusercontent.com/roblabs/openmaptiles-ios-demo/master/OSM2VectorTiles/tileJSON/geography-class.GitHub.json
[styles/geography-class.GitHub.json]: https://raw.githubusercontent.com/roblabs/openmaptiles-ios-demo/master/OSM2VectorTiles/styles/geography-class.GitHub.json
[Maputnik]: https://maputnik.github.io/editor/
[Fresco]: https://fresco.gospatial.org

Expand Down Expand Up @@ -181,6 +183,8 @@ xed .

### Change Log

* Mar 12, 2021
* Upgrade MapLibre for iOS from `5.10.0` to `5.11.0`
* Jan 30, 2021
* Convert to Offline Maps with SwiftUI. Local style with local tiles using the protocol `asset://`
* branch: `mapbox-maps-ios-v10` updated with MapboxMaps Library from https://github.com/mapbox/mapbox-maps-ios
Expand Down

1 comment on commit 7b1a711

@roblabs
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iOS Tests for Release

Using release — https://github.com/maplibre/maplibre-gl-native/releases/tag/ios-v5.11.0

  • Using Xcode Server Bots, build the test app iosapp for Simulators & local Wireless devices

Geography Class Tests for MapLibre 5.11.0

  • Upgrade MapLibre for iOS from 5.10.0 to 5.11.0
    • Deploy Geography Class.app to a device
    • While adding MapLibre in Swift Packages to your project, use Up to Next Major: 5.11.0. Or something appropriate for your project
      • Verify in the Swift Packages Manager that MapboxEvents has been removed
    • Long press on the Info Button and note down its response, "Mapbox Maps SDK for iOS 5.11.0"
    • Verify Readme.md as it is shown in Xcode

While adding MapLibre in Swift Packages to your project, use Up to Next Major: 5.11.0.

Verify in the Swift Packages Manager that MapboxEvents has been removed

Geography Class running MapLibre 5.11.0 on an iPhone SE

Please sign in to comment.