Please sign in to comment.
* feature/#728 - related: more verbose assertions Not very often the unit test fails. With more verbose assertions, we will be able to find out why. Impacted class: * `OpenStreetMapViewTest`: more verbose assertions * feature/#790: map scale merged into floating point zoom This is just a teaser, there are things to fix. For instance, the pinch gesture center is not yet taking into consideration (zooming in or out scrolls the map to the bottom right). All comments are welcomed. Impacted classes: * `CompassOverlay`: used the new `Canvas` related `Matrix` methods of `Projection` * `CopyrightOverlay`: used the new `Canvas` related `Matrix` methods of `Projection` * `LinearRing`: integrated the fact that there's no map scale anymore / should be considered as equal to 1 * `MapController` * feature-related: edited `zoomToFixing` and `onAnimationUpdate`; simplified `onAnimationEnd` * refactoring: removed members `mZoomInAnimation` and `mZoomOutAnimation`; simplified methods `zoomIn`, `zoomInFixing`, `zoomOut`, `zoomOutFixing` * `MapView` * feature-related: removed members `ZOOM_SENSITIVITY`, `ZOOM_LOG_BASE_INV`, `mTargetZoomLevel` and `mMultiTouchScale`; deprecated methods `getZoomLevel(final boolean aPending)`, `zoomIn`, `zoomOut` and `getMapScale`; simplified `canZoomIn` and `canZoomOut`; optimized `dispatchDraw` using the new `Canvas` related `Matrix` methods of `Projection`; created new methods `startAnimation`, `setMultiTouchScale` and new member `mStartAnimationZoom`; impacted pinch gesture methods `getPositionAndScale`, `selectObject` and `setPositionAndScale` * refactoring: removed members `sMotionEventTransformMethod` and `mMercatorPoint`; deprecated methods `getLatitudeSpan`, `getLongitudeSpan` and `getBoundingBoxE6`; simplified method `rotateTouchEvent` * `MinimapOverlay`: removed the "display only when not animating" restriction * `Projection` * feature-related: removed member `float mMultiTouchScale`; removed parameter `pScale` from constructor; removed scale operations from matrices; optimized the computation of `mCurrentCenter`; added methods `save` and `restore` that apply the matrices to canvas only if necessary. * refactoring: renamed member as `mWrapEnabled`; simplified the initialization of `mScreenRectProjection`; added generic method `apply` that apply a `Matrix` to a `Point` * `ScaleBarOverlay`: used the new `Canvas` related `Matrix` methods of `Projection` * `ZoomButtonsOverlay`: used the new `Canvas` related `Matrix` methods of `Projection`; restricted the zoom action to a `ACTION_UP` event * Desperate try to resolve conflict * Desperate try to resolve conflict * Desperate try to resolve conflict * Desperate try to resolve conflict * Merging the pinch gesture scale into floating point zoom (last fix?) Impacted classes: * `Projection`: rewrote the code in order to comply with `ProjectionTest`'s important notice (cf. javadoc) * `ProjectionTest`: fixed the call to `Projection` constructor * Lousy attempt to decrease the time taken by travis. Impacted classes: * `ExtraSamplesTest`: limited to 60 the number of items to run.
- Loading branch information...
Showing with 317 additions and 392 deletions.
- +4 −0 osmdroid-android-it/src/main/java/org/osmdroid/test/ExtraSamplesTest.java
- +6 −2 osmdroid-android-it/src/main/java/org/osmdroid/views/OpenStreetMapViewTest.java
- +15 −9 osmdroid-android/src/main/java/org/osmdroid/util/BoundingBox.java
- +60 −145 osmdroid-android/src/main/java/org/osmdroid/views/MapController.java
- +88 −160 osmdroid-android/src/main/java/org/osmdroid/views/MapView.java
- +131 −51 osmdroid-android/src/main/java/org/osmdroid/views/Projection.java
- +2 −4 osmdroid-android/src/main/java/org/osmdroid/views/overlay/CopyrightOverlay.java
- +1 −1 osmdroid-android/src/main/java/org/osmdroid/views/overlay/LinearRing.java
- +0 −5 osmdroid-android/src/main/java/org/osmdroid/views/overlay/MinimapOverlay.java
- +2 −3 osmdroid-android/src/main/java/org/osmdroid/views/overlay/ScaleBarOverlay.java
- +3 −4 osmdroid-android/src/main/java/org/osmdroid/views/overlay/ZoomButtonsOverlay.java
- +4 −6 osmdroid-android/src/main/java/org/osmdroid/views/overlay/compass/CompassOverlay.java
- +1 −2 osmdroid-android/src/test/java/org/osmdroid/util/ProjectionTest.java
Oops, something went wrong.