[core] Increase pitch to 67.5 degrees

mapbox · Jul 10, 2018 · f629012 · f629012
1 parent 69dcb4c
commit f629012
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 6 deletions.
diff --git a/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp
@@ -33,7 +33,7 @@ constexpr double EARTH_RADIUS_M = 6378137;
 constexpr double LATITUDE_MAX = 85.051128779806604;
 constexpr double LONGITUDE_MAX = 180;
 constexpr double DEGREES_MAX = 360;
-constexpr double PITCH_MAX = M_PI / 3;
+constexpr double PITCH_MAX = 67.5 * DEG2RAD;
 constexpr double MIN_ZOOM = 0.0;
 constexpr double MAX_ZOOM = 25.5;
 constexpr float MIN_ZOOM_F = MIN_ZOOM;

diff --git a/mapbox-gl-js b/mapbox-gl-js
diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp
@@ -265,7 +265,7 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action,
  double easing = bearing - routeMap->getBearing();
  easing += easing > 180.0 ? -360.0 : easing < -180 ? 360.0 : 0;
  routeMap->setBearing(routeMap->getBearing() + (easing / 20));
- routeMap->setPitch(60.0);
+ routeMap->setPitch(67.5);
  routeMap->setZoom(18.0);
  };
  view->animateRouteCallback(view->map);

diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json
@@ -87,5 +87,8 @@
  "render-tests/combinations/symbol-translucent--fill-extrusion-translucent": "needs investigation",
  "render-tests/feature-state/composite-expression": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue",
  "render-tests/feature-state/data-expression": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue",
- "render-tests/feature-state/vector-source": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue"
+ "render-tests/feature-state/vector-source": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue",
+ "render-tests/symbol-placement/line-center-buffer": "https://github.com/mapbox/mapbox-gl-native/issues/12300",
+ "render-tests/symbol-placement/line-center": "https://github.com/mapbox/mapbox-gl-native/issues/12300",
+ "render-tests/text-max-angle/line-center": "https://github.com/mapbox/mapbox-gl-native/issues/12300"
 }
diff --git a/scripts/style-spec.js b/scripts/style-spec.js
@@ -2,3 +2,13 @@ var spec = module.exports = require('../mapbox-gl-js/src/style-spec/reference/v8
 
 // Make temporary modifications here when Native doesn't have all features that JS has.
 delete spec.paint_line['line-gradient'];
+
+// https://github.com/mapbox/mapbox-gl-native/issues/12300
+delete spec.layout_symbol['symbol-placement']['values']['line-center'];
+spec.layout_symbol['icon-keep-upright']['requires'][2]['symbol-placement'] = 'line';
+spec.layout_symbol['text-keep-upright']['requires'][2]['symbol-placement'] = 'line';
+spec.layout_symbol['text-max-angle']['requires'][1]['symbol-placement'] = 'line';
+spec.layout_symbol['icon-rotation-alignment']['values']['map']['doc'] = spec.layout_symbol['icon-rotation-alignment']['values']['map']['doc'].replace(" or `line-center`","");
+spec.layout_symbol['icon-rotation-alignment']['values']['auto']['doc'] = spec.layout_symbol['icon-rotation-alignment']['values']['auto']['doc'].replace(" or `line-center`","");
+spec.layout_symbol['text-rotation-alignment']['values']['map']['doc'] = spec.layout_symbol['text-rotation-alignment']['values']['map']['doc'].replace(" or `line-center`","");
+spec.layout_symbol['text-rotation-alignment']['values']['auto']['doc'] = spec.layout_symbol['text-rotation-alignment']['values']['auto']['doc'].replace(" or `line-center`","");
diff --git a/src/mbgl/util/tile_cover.cpp b/src/mbgl/util/tile_cover.cpp
@@ -96,7 +96,8 @@ std::vector<UnwrappedTileID> tileCover(Point<double> tl,
 
  std::vector<ID> t;
 
- constexpr double maxPitchForUnlimitedCoverage = 45.0 * DEG2RAD;
+ // Increase 0.1 radians to cover for conversion precision loss.
+ constexpr double maxPitchForUnlimitedCoverage = 60.0 * DEG2RAD + 0.1;
 
  // Clamp the axis-aligned coverage area to the nearest 3 neighbor tiles.
  if (pitch > maxPitchForUnlimitedCoverage) {

diff --git a/test/map/transform.test.cpp b/test/map/transform.test.cpp
@@ -599,7 +599,7 @@ TEST(Transform, PitchBounds) {
 
  ASSERT_DOUBLE_EQ(transform.getState().getPitch() * util::RAD2DEG, 0.0);
  ASSERT_DOUBLE_EQ(transform.getState().getMinPitch() * util::RAD2DEG, 0.0);
- ASSERT_DOUBLE_EQ(transform.getState().getMaxPitch() * util::RAD2DEG, 60.0);
+ ASSERT_NEAR(transform.getState().getMaxPitch() * util::RAD2DEG, 67.5, 1e-5);
 
  transform.setMinPitch(45.0 * util::DEG2RAD);
  transform.setPitch(0.0 * util::DEG2RAD);