Merge pull request #8 from brendan-ward/update_maplibre_gl_native

brendan-ward · web-flow · commit 7b08d6972a57 · 2023-01-05T19:21:46.000-08:00
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -43,16 +43,18 @@ jobs:
           git submodule update --init
           cd vendor/maplibre-gl-native && \
             git submodule update --init --recursive \
-              vendor/earcut.hpp \
-              vendor/polylabel \
-              vendor/protozero \
-              vendor/wagyu \
-              vendor/unique_resource \
               vendor/boost \
+              vendor/cpp-httplib \
+              vendor/earcut.hpp \
               vendor/eternal \
               vendor/googletest \
+              vendor/polylabel \
+              vendor/protozero \
               vendor/mapbox-base \
-              vendor/vector-tile
+              vendor/unique_resource \
+              vendor/vector-tile \
+              vendor/wagyu \
+              vendor/zip-archive
 
       - name: Set up Python
         uses: actions/setup-python@v2
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,16 +30,18 @@ jobs:
           git submodule update --init
           cd vendor/maplibre-gl-native && \
             git submodule update --init --recursive \
-              vendor/earcut.hpp \
-              vendor/polylabel \
-              vendor/protozero \
-              vendor/wagyu \
-              vendor/unique_resource \
               vendor/boost \
+              vendor/cpp-httplib \
+              vendor/earcut.hpp \
               vendor/eternal \
               vendor/googletest \
+              vendor/polylabel \
+              vendor/protozero \
               vendor/mapbox-base \
-              vendor/vector-tile
+              vendor/unique_resource \
+              vendor/vector-tile \
+              vendor/wagyu \
+              vendor/zip-archive
 
       - name: Set up Python
         uses: actions/setup-python@v2
diff --git a/.gitmodules b/.gitmodules
@@ -5,4 +5,4 @@
 [submodule "vendor/maplibre-gl-native"]
 	path = vendor/maplibre-gl-native
 	url = https://github.com/maplibre/maplibre-gl-native
-	branch = master
+	branch = main
diff --git a/README.md b/README.md
@@ -369,16 +369,18 @@ Run the following:
 cd vendor/maplibre-gl-native
 
 git submodule update --init --recursive \
-    vendor/earcut.hpp \
-    vendor/polylabel \
-    vendor/protozero \
-    vendor/wagyu \
-    vendor/unique_resource \
     vendor/boost \
+    vendor/cpp-httplib \
+    vendor/earcut.hpp \
     vendor/eternal \
     vendor/googletest \
+    vendor/polylabel \
+    vendor/protozero \
     vendor/mapbox-base \
-    vendor/vector-tile
+    vendor/unique_resource \
+    vendor/vector-tile \
+    vendor/wagyu \
+    vendor/zip-archive
 ```
 
 To later update `maplibre-gl-native`:
diff --git a/mbgl-core/maplibre-gl-native-core.cmake b/mbgl-core/maplibre-gl-native-core.cmake
@@ -1,4 +1,4 @@
-### Build mbgl-core
+# ## Build mbgl-core
 # Adapted from maplibre-gl-core/CMakeLists.txt
 
 add_library(
@@ -20,7 +20,6 @@ target_compile_options(
 )
 
 # NOTE: removed all *.hpp file entries from below, and merged file lists to include OpenGL section
-
 add_library(
     mbgl-core STATIC
     ${MBGL_SOURCE_DIR}/src/mbgl/actor/mailbox.cpp
@@ -266,6 +265,7 @@ add_library(
     ${MBGL_SOURCE_DIR}/src/mbgl/tile/vector_tile.cpp
     ${MBGL_SOURCE_DIR}/src/mbgl/tile/vector_tile_data.cpp
     ${MBGL_SOURCE_DIR}/src/mbgl/util/camera.cpp
+    ${MBGL_SOURCE_DIR}/src/mbgl/util/client_options.cpp
     ${MBGL_SOURCE_DIR}/src/mbgl/util/bounding_volumes.cpp
     ${MBGL_SOURCE_DIR}/src/mbgl/util/chrono.cpp
     ${MBGL_SOURCE_DIR}/src/mbgl/util/color.cpp
@@ -400,10 +400,10 @@ target_compile_definitions(
 if(EXISTS ${MBGL_SOURCE_DIR}/.git/HEAD)
     execute_process(
         COMMAND
-            git
-            rev-parse
-            --short=8
-            HEAD
+        git
+        rev-parse
+        --short=8
+        HEAD
         WORKING_DIRECTORY ${MBGL_SOURCE_DIR}
         OUTPUT_VARIABLE MBGL_VERSION_REV
         OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -419,18 +419,16 @@ set_source_files_properties(
     MBGL_VERSION_REV="${MBGL_VERSION_REV}"
 )
 
-
 # TODO: not needed, already globally defined?
 # target_include_directories(
-#    mbgl-core
-#    PRIVATE ${MBGL_SOURCE_DIR}/src
-#)
-
-#target_include_directories(
-#    mbgl-core
-#    PUBLIC ${MBGL_SOURCE_DIR}/include
-#)
+# mbgl-core
+# PRIVATE ${MBGL_SOURCE_DIR}/src
+# )
 
+# target_include_directories(
+# mbgl-core
+# PUBLIC ${MBGL_SOURCE_DIR}/include
+# )
 include(${MBGL_SOURCE_DIR}/vendor/boost.cmake)
 include(${MBGL_SOURCE_DIR}/vendor/csscolorparser.cmake)
 include(${MBGL_SOURCE_DIR}/vendor/earcut.hpp.cmake)
@@ -446,37 +444,37 @@ include(${MBGL_SOURCE_DIR}/vendor/wagyu.cmake)
 target_link_libraries(
     mbgl-core
     PRIVATE
-        Mapbox::Base::Extras::kdbush.hpp
-        Mapbox::Base::supercluster.hpp
-        Mapbox::Base::shelf-pack-cpp
-        Mapbox::Base::geojson-vt-cpp
-        Mapbox::Base::cheap-ruler-cpp
-        mbgl-compiler-options
-        mbgl-vendor-boost
-        mbgl-vendor-csscolorparser
-        mbgl-vendor-earcut.hpp
-        mbgl-vendor-eternal
-        mbgl-vendor-parsedate
-        mbgl-vendor-polylabel
-        mbgl-vendor-protozero
-        mbgl-vendor-unique_resource
-        mbgl-vendor-vector-tile
-        mbgl-vendor-wagyu
+    Mapbox::Base::Extras::kdbush.hpp
+    Mapbox::Base::supercluster.hpp
+    Mapbox::Base::shelf-pack-cpp
+    Mapbox::Base::geojson-vt-cpp
+    Mapbox::Base::cheap-ruler-cpp
+    mbgl-compiler-options
+    mbgl-vendor-boost
+    mbgl-vendor-csscolorparser
+    mbgl-vendor-earcut.hpp
+    mbgl-vendor-eternal
+    mbgl-vendor-parsedate
+    mbgl-vendor-polylabel
+    mbgl-vendor-protozero
+    mbgl-vendor-unique_resource
+    mbgl-vendor-vector-tile
+    mbgl-vendor-wagyu
     PUBLIC
-        Mapbox::Base
-        Mapbox::Base::Extras::expected-lite
-        Mapbox::Base::Extras::rapidjson
-        Mapbox::Base::geojson.hpp
-        Mapbox::Base::geometry.hpp
-        Mapbox::Base::optional
-        Mapbox::Base::variant
+    Mapbox::Base
+    Mapbox::Base::Extras::expected-lite
+    Mapbox::Base::Extras::rapidjson
+    Mapbox::Base::geojson.hpp
+    Mapbox::Base::geometry.hpp
+    Mapbox::Base::optional
+    Mapbox::Base::variant
 )
 
 add_library(
     Mapbox::Map ALIAS mbgl-core
 )
 
-### End maplibre-gl-core/CMakeLists.txt
+# ## End maplibre-gl-core/CMakeLists.txt
 
 # Build mbgl-core with specific platform requirements
 if(CMAKE_SYSTEM_NAME STREQUAL Linux)
diff --git a/pymgl/tests/fixtures/example-style-bad-remote.json b/pymgl/tests/fixtures/example-style-bad-remote.json
@@ -3,7 +3,7 @@
     "sources": {
         "basemap": {
             "type": "raster",
-            "tiles": ["http://localhost:8080/{z}/{y}/{x}"]
+            "tiles": ["http://localhost:8111/{z}/{y}/{x}"]
         }
     },
     "layers": [
diff --git a/pymgl/tests/test_style.py b/pymgl/tests/test_style.py
@@ -194,7 +194,7 @@ def test_invalid_style():
 
 
 @pytest.mark.skipif(not has_poorconn, reason="poorconn test lib not available")
-@pytest.mark.poorconn_http_server_config(port=8080, t=1, length=10)
+@pytest.mark.poorconn_http_server_config(port=8111, t=1, length=10)
 def test_slow_tile_server(poorconn_http_server, tmp_path, capsys):
     # write fake tile
     tile_path = tmp_path / "0/0"
diff --git a/vendor/maplibre-gl-native b/vendor/maplibre-gl-native
@@ -1 +1 @@
-Subproject commit 7b87017b53f3f4b450d58996481dc25beca1b38f
+Subproject commit e4b4810ad288adb4e33e1e81771a9cb6c96a026e
diff --git a/vendor/pybind11 b/vendor/pybind11
@@ -1 +1 @@
-Subproject commit ffa346860b306c9bbfb341aed9c14c067751feb8
+Subproject commit 12852cd33bdaae0fe5fecc0db39b788dbbcc7b3d

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"sources": {`
`4`	`4`	`"basemap": {`
`5`	`5`	`"type": "raster",`
`6`		`- "tiles": ["http://localhost:8080/{z}/{y}/{x}"]`
	`6`	`+ "tiles": ["http://localhost:8111/{z}/{y}/{x}"]`
`7`	`7`	`}`
`8`	`8`	`},`
`9`	`9`	`"layers": [`