From aed532b11d27096d4eaf2c6caf2489ad58ab208e Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 3 Mar 2015 17:41:23 -0600 Subject: [PATCH] #877 - Removing Sample Location data model and access methods --- include/mbgl/ios/MGLMapView.h | 4 ---- include/mbgl/map/map.hpp | 6 +----- include/mbgl/map/transform.hpp | 5 ----- include/mbgl/map/transform_state.hpp | 6 +----- platform/ios/MGLMapView.mm | 32 ---------------------------- src/mbgl/map/map.cpp | 9 -------- src/mbgl/map/transform.cpp | 22 ------------------- src/mbgl/map/transform_state.cpp | 10 --------- 8 files changed, 2 insertions(+), 92 deletions(-) diff --git a/include/mbgl/ios/MGLMapView.h b/include/mbgl/ios/MGLMapView.h index af8eed866e5..8a0a57f45a6 100644 --- a/include/mbgl/ios/MGLMapView.h +++ b/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 */ diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 8c01045ea63..844970bb8f8 100644 --- a/include/mbgl/map/map.hpp +++ b/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 getSampleLocations() const; - std::array, 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()); diff --git a/include/mbgl/map/transform.hpp b/include/mbgl/map/transform.hpp index 3f11c8b9fcb..94bea11a45d 100644 --- a/include/mbgl/map/transform.hpp +++ b/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 getSampleLocations() const; - std::array, 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: diff --git a/include/mbgl/map/transform_state.hpp b/include/mbgl/map/transform_state.hpp index 83513c582ec..e5e62e516fd 100644 --- a/include/mbgl/map/transform_state.hpp +++ b/include/mbgl/map/transform_state.hpp @@ -55,11 +55,7 @@ class TransformState { // Changing bool isChanging() const; - - // Sample Location Data - std::array getSampleLocations() const; - std::array, 4> getSampleLocationsScreenCoordinates() const; - + private: double pixel_x() const; double pixel_y() const; diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index 435eafd1957..3e84398a03b 100644 --- a/platform/ios/MGLMapView.mm +++ b/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 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, 4> locs = mbglMap->getSampleLocationsScreenCoordinates(); - for (unsigned long lc = 0; lc < locs.size(); lc++) { - mbgl::vec2 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 diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index f87678a633d..0ac9b6b2803 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -482,15 +482,6 @@ double Map::getMaxZoom() const { return transform.getMaxZoom(); } -#pragma mark - Sample Locations -std::array Map::getSampleLocations() const { - return transform.getSampleLocations(); -} - -std::array, 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) { diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp index f185e126ea9..250d0addfa4 100644 --- a/src/mbgl/map/transform.cpp +++ b/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 Transform::getSampleLocations() const { - return current.getSampleLocations(); -} - -std::array, 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 locs = current.getSampleLocations(); - - for (unsigned long lc = 0; lc < locs.size(); lc++) { - mbgl::vec2 pixel = current.pixelForLatLng(locs[lc]); - current.sampleLocationsScreenCooridnates[lc] = pixel; - } -} - #pragma mark - Constraints void Transform::constrain(double& scale, double& y) const { diff --git a/src/mbgl/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp index dd3e43823dd..7ed0a23b426 100644 --- a/src/mbgl/map/transform_state.cpp +++ b/src/mbgl/map/transform_state.cpp @@ -252,16 +252,6 @@ bool TransformState::isChanging() const { return rotating || scaling || panning; } -#pragma mark - Sample Locations - -std::array TransformState::getSampleLocations() const { - return sampleLocations; -} - -std::array, 4> TransformState::getSampleLocationsScreenCoordinates() const { - return sampleLocationsScreenCooridnates; -} - #pragma mark - (private helper functions)