#877 - Removing Sample Location data model and access methods

include/mbgl/ios/MGLMapView.h

@@ -133,10 +133,6 @@
 /** Resets the map rotation to a northern heading. */
 - (void)resetNorth;
 
-# pragma mark - Sample Locations
-- (NSArray *) getSampleLoctions;
-- (NSArray *) getSampleLoctionsScreenCoordinatesConvertedFromView:(UIView *)view;
-
 #pragma mark - Converting Map Coordinates
 
 /** @name Converting Map Coordinates */

include/mbgl/map/map.hpp

@@ -115,11 +115,7 @@ class Map : private util::noncopyable {
  void stopScaling();
  double getMinZoom() const;
  double getMaxZoom() const;
-
- // Sample Locations
- std::array<LatLng, 4> getSampleLocations() const;
- std::array<mbgl::vec2<double>, 4> getSampleLocationsScreenCoordinates() const;
-
+
  // Rotation
  void rotateBy(double sx, double sy, double ex, double ey, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
  void setBearing(double degrees, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());

include/mbgl/map/transform.hpp

@@ -44,10 +44,6 @@ class Transform : private util::noncopyable {
  void stopScaling();
  double getMinZoom() const;
  double getMaxZoom() const;
-
- // Sample Locations
- std::array<LatLng, 4> getSampleLocations() const;
- std::array<mbgl::vec2<double>, 4> getSampleLocationsScreenCoordinates() const;
 
  // Angle
  void rotateBy(double sx, double sy, double ex, double ey, std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
@@ -77,7 +73,6 @@ class Transform : private util::noncopyable {
  void _clearRotating();
  void _clearScaling();
 
- void updateSampleLocationScreenCoordinates();
  void constrain(double& scale, double& y) const;
 
 private:

include/mbgl/map/transform_state.hpp

@@ -55,11 +55,7 @@ class TransformState {
 
  // Changing
  bool isChanging() const;
-
- // Sample Location Data
- std::array<LatLng, 4> getSampleLocations() const;
- std::array<mbgl::vec2<double>, 4> getSampleLocationsScreenCoordinates() const;
-
+
 private:
  double pixel_x() const;
  double pixel_y() const;

platform/ios/MGLMapView.mm

@@ -917,38 +917,6 @@ - (CLLocationDistance)metersPerPixelAtLatitude:(CLLocationDegrees)latitude
  return mbglMap->getMetersPerPixelAtLatitude(latitude, self.zoomLevel);
 }
 
-# pragma mark - Sample Locations
-- (NSArray *) getSampleLoctions {
- NSMutableArray* results = [[NSMutableArray alloc] init];
-
- std::array<mbgl::LatLng, 4> locs = mbglMap->getSampleLocations();
-
- for (unsigned long lc = 0; lc < locs.size(); lc++) {
- NSString *latLon = [NSString stringWithFormat:@"%f,%f", locs[lc].latitude, locs[lc].longitude];
- [results addObject:latLon];
- }
-
- return results;
-}
-
-- (NSArray *) getSampleLoctionsScreenCoordinatesConvertedFromView:(UIView *)view {
-
- NSMutableArray* results = [[NSMutableArray alloc] init];
-
- std::array<mbgl::vec2<double>, 4> locs = mbglMap->getSampleLocationsScreenCoordinates();
- for (unsigned long lc = 0; lc < locs.size(); lc++) {
- mbgl::vec2<double> pixel = locs[lc];
- // flip y coordinate for iOS view origin in top left
- //
- pixel.y = self.bounds.size.height - pixel.y;
-
- [results addObject:[NSValue valueWithCGPoint:[self convertPoint:CGPointMake(pixel.x, pixel.y) toView:view]]];
- }
-
- return results;
-}
-
-
 #pragma mark - Styling -
 
 - (NSDictionary *)getRawStyle

src/mbgl/map/map.cpp

@@ -482,15 +482,6 @@ double Map::getMaxZoom() const {
  return transform.getMaxZoom();
 }
 
-#pragma mark - Sample Locations
-std::array<LatLng, 4> Map::getSampleLocations() const {
- return transform.getSampleLocations();
-}
-
-std::array<mbgl::vec2<double>, 4> Map::getSampleLocationsScreenCoordinates() const {
- return transform.getSampleLocationsScreenCoordinates();
-}
-
 #pragma mark - Rotation
 
 void Map::rotateBy(double sx, double sy, double ex, double ey, std::chrono::steady_clock::duration duration) {

src/mbgl/map/transform.cpp

@@ -56,9 +56,6 @@ void Transform::_moveBy(const double dx, const double dy, const std::chrono::ste
  view.notifyMapChange(duration != std::chrono::steady_clock::duration::zero() ?
  MapChangeRegionWillChangeAnimated :
  MapChangeRegionWillChange);
-
-
- updateSampleLocationScreenCoordinates();
 
  final.x = current.x + std::cos(current.angle) * dx + std::sin(current.angle) * dy;
  final.y = current.y + std::cos(current.angle) * dy + std::sin(-current.angle) * dx;
@@ -210,14 +207,6 @@ double Transform::getMaxZoom() const {
  return std::log2(max_scale);
 }
 
-std::array<LatLng, 4> Transform::getSampleLocations() const {
- return current.getSampleLocations();
-}
-
-std::array<mbgl::vec2<double>, 4> Transform::getSampleLocationsScreenCoordinates() const {
- return current.getSampleLocationsScreenCoordinates();
-}
-
 void Transform::_clearScaling() {
  // This is only called internally, so we don't need a lock here.
 
@@ -300,17 +289,6 @@ void Transform::_setScaleXY(const double new_scale, const double xn, const doubl
  duration);
 }
 
-#pragma mark - Sample Location Screen Coordinates
-void Transform::updateSampleLocationScreenCoordinates() {
-
- std::array<LatLng, 4> locs = current.getSampleLocations();
-
- for (unsigned long lc = 0; lc < locs.size(); lc++) {
- mbgl::vec2<double> pixel = current.pixelForLatLng(locs[lc]);
- current.sampleLocationsScreenCooridnates[lc] = pixel;
- }
-}
-
 #pragma mark - Constraints
 
 void Transform::constrain(double& scale, double& y) const {

src/mbgl/map/transform_state.cpp

@@ -252,16 +252,6 @@ bool TransformState::isChanging() const {
  return rotating || scaling || panning;
 }
 
-#pragma mark - Sample Locations
-
-std::array<LatLng, 4> TransformState::getSampleLocations() const {
- return sampleLocations;
-}
-
-std::array<mbgl::vec2<double>, 4> TransformState::getSampleLocationsScreenCoordinates() const {
- return sampleLocationsScreenCooridnates;
-}
-
 #pragma mark - (private helper functions)