diff --git a/ios-for-arcgis b/ios-for-arcgis index d5d6567..d364ad0 160000 --- a/ios-for-arcgis +++ b/ios-for-arcgis @@ -1 +1 @@ -Subproject commit d5d65670dbf09f069f5d35a93af5ec3c6cb7aecf +Subproject commit d364ad000a6b06a8ccb26f92367ab83f962c1450 diff --git a/ios-for-googlemaps b/ios-for-googlemaps index 2476a09..16848fb 160000 --- a/ios-for-googlemaps +++ b/ios-for-googlemaps @@ -1 +1 @@ -Subproject commit 2476a09464003bbabce7b4203c023cc269bf768b +Subproject commit 16848fbd886bd89e7898351e077b29c1451d0ed3 diff --git a/ios-for-here b/ios-for-here index 8c5ed90..8301787 160000 --- a/ios-for-here +++ b/ios-for-here @@ -1 +1 @@ -Subproject commit 8c5ed904aa8f48532c00e463f4ba95394e2cc935 +Subproject commit 83017871151baa6ed4df69521cd43ea701789ff4 diff --git a/ios-for-longdo b/ios-for-longdo index aab63ef..a50cb6b 160000 --- a/ios-for-longdo +++ b/ios-for-longdo @@ -1 +1 @@ -Subproject commit aab63ef37dfd4960d274a433e7823b15632d8fb6 +Subproject commit a50cb6b579cfadf11a18d6a4dc5967f2026fd349 diff --git a/ios-for-mapbox b/ios-for-mapbox index 608f905..f3c607a 160000 --- a/ios-for-mapbox +++ b/ios-for-mapbox @@ -1 +1 @@ -Subproject commit 608f9055ffa0bbdc8d4a05d9477be2ae319b0883 +Subproject commit f3c607a523412a1ca7097d88cf3000046fa04f7a diff --git a/ios-for-mapkit b/ios-for-mapkit index 5cbe674..24ee69c 160000 --- a/ios-for-mapkit +++ b/ios-for-mapkit @@ -1 +1 @@ -Subproject commit 5cbe674c6524e0caaf6d3834a2a9f12de415da4a +Subproject commit 24ee69ce214ad620ca0b7d20de31ac90a17f09a6 diff --git a/ios-for-maplibre b/ios-for-maplibre index 4235810..d8c5cb2 160000 --- a/ios-for-maplibre +++ b/ios-for-maplibre @@ -1 +1 @@ -Subproject commit 4235810f2a7b85d530c40d7d6990b498f9048c3d +Subproject commit d8c5cb2d5c61f1b00bbc9af631d5d423c8b1ba15 diff --git a/ios-for-mappls b/ios-for-mappls index ea4dcd7..29484a6 160000 --- a/ios-for-mappls +++ b/ios-for-mappls @@ -1 +1 @@ -Subproject commit ea4dcd789da7a2d30cea1da443273f9d465f9037 +Subproject commit 29484a60b33451997b4911c4e175ea6caa75e835 diff --git a/ios-for-maptiler b/ios-for-maptiler index 293ecca..2de2305 160000 --- a/ios-for-maptiler +++ b/ios-for-maptiler @@ -1 +1 @@ -Subproject commit 293ecca12af4d73e636a4da69ef0d98c2c09e1a8 +Subproject commit 2de23059f00463e356e83eef69a75481653b044c diff --git a/ios-for-openmobilemaps b/ios-for-openmobilemaps index 29b5df0..e0ab1ee 160000 --- a/ios-for-openmobilemaps +++ b/ios-for-openmobilemaps @@ -1 +1 @@ -Subproject commit 29b5df08a69b9680fad9d727df835a6d354d9ae1 +Subproject commit e0ab1eeb462e304caa3b422c8df7ba7f4710f4e1 diff --git a/ios-for-tomtom b/ios-for-tomtom index 8381fb0..d385129 160000 --- a/ios-for-tomtom +++ b/ios-for-tomtom @@ -1 +1 @@ -Subproject commit 8381fb0bf16373e3a6de7fdab7d973fd1f8867bd +Subproject commit d3851294415da53ce77b38fc4bcbbdfc339de505 diff --git a/ios-sdk-core b/ios-sdk-core index dc800b9..08b4d72 160000 --- a/ios-sdk-core +++ b/ios-sdk-core @@ -1 +1 @@ -Subproject commit dc800b9198c8280006d696516ac57d79d08d6a33 +Subproject commit 08b4d72e74d1657125908df0a8888d3b5c1e5516 diff --git a/samples/MapConductorSampleApp/MapConductorSampleApp.xcodeproj/project.pbxproj b/samples/MapConductorSampleApp/MapConductorSampleApp.xcodeproj/project.pbxproj index b627f39..ca744a8 100644 --- a/samples/MapConductorSampleApp/MapConductorSampleApp.xcodeproj/project.pbxproj +++ b/samples/MapConductorSampleApp/MapConductorSampleApp.xcodeproj/project.pbxproj @@ -111,6 +111,7 @@ B0A1D3E58CCB8244F30FBBF4 /* A2DBubbleProbeUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73E26429303A139633A520F2 /* A2DBubbleProbeUITests.swift */; }; B2B112AA7F88521C3FD10FDD /* HolePolygonUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08101FE49CA383BD346A656C /* HolePolygonUITests.swift */; }; BD2731DF6E02759221CA5C94 /* CameraSyncTestViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C251EA117D0D739F43944D94 /* CameraSyncTestViewModel.swift */; }; + BD4622474FEDF89F306D5989 /* MarkerLabelPositionPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1E080576F5AF1A485FA1118 /* MarkerLabelPositionPage.swift */; }; BE5D7705F2D71DD9DE900C5D /* PostOfficeDataLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F129A8A5CDCF49717F09F1 /* PostOfficeDataLoader.swift */; }; BEC3F92921F126CF3DA899C5 /* MapLibreTiltZoomUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C93487E79A349AC12446EDA /* MapLibreTiltZoomUITests.swift */; }; C4CDD243D337D97B10CFAFBF /* NavigationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B02E9F2ADE08AB6F6A9F0F3 /* NavigationViewModel.swift */; }; @@ -188,7 +189,6 @@ 2B9266EDD049DA45972FDCE9 /* ios-for-tomtom */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "ios-for-tomtom"; path = "../../ios-for-tomtom"; sourceTree = SOURCE_ROOT; }; 2C36C321C43614D74792FE49 /* PostOfficeMapComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostOfficeMapComponent.swift; sourceTree = ""; }; 2D663A887D0AFCDCAF6E4EB7 /* PolylineGeodesicPageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PolylineGeodesicPageViewModel.swift; sourceTree = ""; }; - 2D8B401108F00801E7244C06 /* ios-geojson-layer */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "ios-geojson-layer"; path = "../../ios-geojson-layer"; sourceTree = SOURCE_ROOT; }; 2E9ACEF15DA4EA6478E15919 /* BasicGeoJSONMapPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasicGeoJSONMapPage.swift; sourceTree = ""; }; 313B53E1BB15ED36A24D884A /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; 32B1FF3E2CC528F12B3F4EAD /* HereHitTestPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HereHitTestPage.swift; sourceTree = ""; }; @@ -232,6 +232,7 @@ 78FB7B1699E13C53108BF653 /* OpenMobileMapsDeviceSweepUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenMobileMapsDeviceSweepUITests.swift; sourceTree = ""; }; 79A12BB5733A9219AF9BC32E /* SelectedProviderStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectedProviderStore.swift; sourceTree = ""; }; 7C878252AEEAFC99FEC69A95 /* RasterLayerPageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RasterLayerPageViewModel.swift; sourceTree = ""; }; + 7EE360DCB2F3547A51FBB17A /* ios-geojson */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "ios-geojson"; path = "../../ios-geojson"; sourceTree = SOURCE_ROOT; }; 803C0755788E22BF686AB8DB /* RasterLayerMapComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RasterLayerMapComponent.swift; sourceTree = ""; }; 8281BE72BC47056A7E6108BB /* SampleMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleMapView.swift; sourceTree = ""; }; 85C0AB60B489874EBCF704F5 /* MapDesignMapComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapDesignMapComponent.swift; sourceTree = ""; }; @@ -292,6 +293,7 @@ DDCE316F0873F733D073DCFB /* TokyoPostOffices.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TokyoPostOffices.swift; sourceTree = ""; }; DFA7A17FE65561B4737D7AC2 /* PostOfficePage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostOfficePage.swift; sourceTree = ""; }; E09E3098A7041DD92F4CDA5D /* FitBoundsPageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FitBoundsPageViewModel.swift; sourceTree = ""; }; + E1E080576F5AF1A485FA1118 /* MarkerLabelPositionPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkerLabelPositionPage.swift; sourceTree = ""; }; E2601B9681BC7350C9B999E5 /* HeatmapMapPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeatmapMapPage.swift; sourceTree = ""; }; E2F129A8A5CDCF49717F09F1 /* PostOfficeDataLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostOfficeDataLoader.swift; sourceTree = ""; }; E37BD0E38E109FB9A88C7FEF /* LongdoInfoBubbleUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LongdoInfoBubbleUITests.swift; sourceTree = ""; }; @@ -372,6 +374,14 @@ path = click; sourceTree = ""; }; + 0AE7BB5036D1C5457AE088BF /* labelposition */ = { + isa = PBXGroup; + children = ( + E1E080576F5AF1A485FA1118 /* MarkerLabelPositionPage.swift */, + ); + path = labelposition; + sourceTree = ""; + }; 248DAB3F99A5A003037AC88C /* flyto */ = { isa = PBXGroup; children = ( @@ -641,7 +651,7 @@ D729856F6C332EFE88125934 /* ios-for-maptiler */, 59A41E8801182242AA851AD7 /* ios-for-openmobilemaps */, 2B9266EDD049DA45972FDCE9 /* ios-for-tomtom */, - 2D8B401108F00801E7244C06 /* ios-geojson-layer */, + 7EE360DCB2F3547A51FBB17A /* ios-geojson */, 115EEADF4253AE3F62E349B7 /* ios-heatmap */, 4B5FA1B6F9FF315058B30672 /* ios-kml */, 7105347887569C04EFF104DE /* ios-marker-clustering */, @@ -655,6 +665,7 @@ children = ( 26DCDFAFCE10C799D9006B95 /* animation */, 52AB755255659E2B9224803B /* icons */, + 0AE7BB5036D1C5457AE088BF /* labelposition */, 4372DBEE065AA4AEEA109523 /* postoffice */, 80CD2CD0E2CB85EFB411F92D /* postofficecluster */, ); @@ -971,7 +982,7 @@ BF0F2FCA7969598D48B37AF1 /* XCLocalSwiftPackageReference "../../ios-for-maptiler" */, 9054F334F672A595D3EBBA35 /* XCLocalSwiftPackageReference "../../ios-for-openmobilemaps" */, BD32CF317AE66D8094450F62 /* XCLocalSwiftPackageReference "../../ios-for-tomtom" */, - 5182F458F2DB02C7AD92C609 /* XCLocalSwiftPackageReference "../../ios-geojson-layer" */, + 6B10040E7BDD9BBC60A8E023 /* XCLocalSwiftPackageReference "../../ios-geojson" */, 942816B2270F970F8C62B71B /* XCLocalSwiftPackageReference "../../ios-heatmap" */, 8687AE3704EDFA8ED20AA08F /* XCLocalSwiftPackageReference "../../ios-kml" */, 05117C6470473D852EB5AD45 /* XCLocalSwiftPackageReference "../../ios-marker-clustering" */, @@ -1056,6 +1067,7 @@ 768036852114CA499289CB4D /* MapDesignPageViewModel.swift in Sources */, 5E917641E9ED4BE2C183CB8F /* MarkerBasicMapComponent.swift in Sources */, E57233C3053759A16911AE99 /* MarkerBasicPage.swift in Sources */, + BD4622474FEDF89F306D5989 /* MarkerLabelPositionPage.swift in Sources */, 82F246CF9D7DABFECC0BAB49 /* MultipleBubblesPage.swift in Sources */, C4CDD243D337D97B10CFAFBF /* NavigationViewModel.swift in Sources */, E55D7E7E754923BB4899F1D0 /* PolygonClickMapPage.swift in Sources */, @@ -1401,9 +1413,9 @@ isa = XCLocalSwiftPackageReference; relativePath = "../../ios-for-maplibre"; }; - 5182F458F2DB02C7AD92C609 /* XCLocalSwiftPackageReference "../../ios-geojson-layer" */ = { + 6B10040E7BDD9BBC60A8E023 /* XCLocalSwiftPackageReference "../../ios-geojson" */ = { isa = XCLocalSwiftPackageReference; - relativePath = "../../ios-geojson-layer"; + relativePath = "../../ios-geojson"; }; 7C7281FBA1BC87C10DADAAAE /* XCLocalSwiftPackageReference "../../ios-for-longdo" */ = { isa = XCLocalSwiftPackageReference; @@ -1465,7 +1477,7 @@ repositoryURL = "https://github.com/googlemaps/ios-maps-sdk"; requirement = { kind = exactVersion; - version = 11.0.0; + version = 11.2.0; }; }; EA9904C5DC8D915C46A8309E /* XCRemoteSwiftPackageReference "ZIPFoundation" */ = { diff --git a/samples/MapConductorSampleApp/MapConductorSampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/samples/MapConductorSampleApp/MapConductorSampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 909e94b..7cfc28d 100644 --- a/samples/MapConductorSampleApp/MapConductorSampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/samples/MapConductorSampleApp/MapConductorSampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/googlemaps/ios-maps-sdk", "state" : { - "revision" : "c37c4946d60f0ab069476d5781053b837771546e", - "version" : "11.0.0" + "revision" : "e096f5c46d84c01c0a0a55df7263d5c6631535d6", + "version" : "11.2.0" } }, { @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-common-ios.git", "state" : { - "revision" : "3f75a38a631836aa76f291034a1eac5f614b22c8", - "version" : "24.26.0" + "revision" : "85ac5fc604b64b682bebd6ba6844db6f30312316", + "version" : "24.33.0" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", "state" : { - "revision" : "77687efffacd04bd9d22e532bfb4cb71c3ec1e5e", - "version" : "11.26.0" + "revision" : "f8f28f37c2d94acaf2bb7fbacbcae0847a2e810e", + "version" : "11.33.0" } }, { @@ -50,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-maps-ios-binary", "state" : { - "revision" : "9bc931cc1322b118611d533764b0c3f9eea3f609", - "version" : "11.26.0" + "revision" : "6608c84edc8cfd954e32dcaac718db4c12806420", + "version" : "11.33.0" } }, { @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/maplibre/maplibre-gl-native-distribution", "state" : { - "revision" : "84a79bc375a301169390ac110c868f06c857b83f", - "version" : "6.27.0" + "revision" : "13e41ab3d77ff5113e7e5d4ee87803b1f81f5683", + "version" : "6.31.0" } }, { @@ -68,8 +68,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mappls-api/mappls-api-core-ios-distribution.git", "state" : { - "revision" : "8f69fc59f1ca2c46ed7a7925bc9d5030cdb258ef", - "version" : "2.1.3" + "revision" : "57071fc283ffb1926ca1a2fc6fb820140ee83b39", + "version" : "2.1.6" } }, { diff --git a/samples/MapConductorSampleApp/MapConductorSampleApp.xcworkspace/xcshareddata/swiftpm/Package.resolved b/samples/MapConductorSampleApp/MapConductorSampleApp.xcworkspace/xcshareddata/swiftpm/Package.resolved index 292d6ec..7cfc28d 100644 --- a/samples/MapConductorSampleApp/MapConductorSampleApp.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/samples/MapConductorSampleApp/MapConductorSampleApp.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/googlemaps/ios-maps-sdk", "state" : { - "revision" : "c37c4946d60f0ab069476d5781053b837771546e", - "version" : "11.0.0" + "revision" : "e096f5c46d84c01c0a0a55df7263d5c6631535d6", + "version" : "11.2.0" } }, { @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-common-ios.git", "state" : { - "revision" : "02a45db62eda9dcfe4f7740f6c7e62a02337f755", - "version" : "24.20.2" + "revision" : "85ac5fc604b64b682bebd6ba6844db6f30312316", + "version" : "24.33.0" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", "state" : { - "revision" : "a647944cd4c853340ee9adb277c5f26930f442be", - "version" : "11.20.2" + "revision" : "f8f28f37c2d94acaf2bb7fbacbcae0847a2e810e", + "version" : "11.33.0" } }, { @@ -50,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-maps-ios-binary", "state" : { - "revision" : "0ff87dd522b5d61293b2635a5c897faa77e230f2", - "version" : "11.20.2" + "revision" : "6608c84edc8cfd954e32dcaac718db4c12806420", + "version" : "11.33.0" } }, { @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/maplibre/maplibre-gl-native-distribution", "state" : { - "revision" : "5d121591b60e837413391814ed88deca2aa7c1d8", - "version" : "6.24.0" + "revision" : "13e41ab3d77ff5113e7e5d4ee87803b1f81f5683", + "version" : "6.31.0" } }, { @@ -68,8 +68,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mappls-api/mappls-api-core-ios-distribution.git", "state" : { - "revision" : "8f69fc59f1ca2c46ed7a7925bc9d5030cdb258ef", - "version" : "2.1.3" + "revision" : "57071fc283ffb1926ca1a2fc6fb820140ee83b39", + "version" : "2.1.6" } }, { diff --git a/samples/MapConductorSampleApp/project.yml b/samples/MapConductorSampleApp/project.yml index 6c4e210..375b8c3 100644 --- a/samples/MapConductorSampleApp/project.yml +++ b/samples/MapConductorSampleApp/project.yml @@ -27,7 +27,7 @@ packages: path: ../../ios-marker-clustering ios-maps-sdk: url: https://github.com/googlemaps/ios-maps-sdk - version: 11.0.0 + version: 11.2.0 ios-for-mapbox: path: ../../ios-for-mapbox ios-for-tomtom: