Skip to content

Closes #3 -- zoom doesnt increment to 19 if minNumTiles not met #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MichaelChirico wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Closes #3 -- zoom doesnt increment to 19 if minNumTiles not met #4

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
de942b5
Closes #3 -- zoom doesnt increment to 19 if minNumTiles not met
Oct 8, 2018
5f19d89
Include details of auto-zoom in the manual
Oct 8, 2018
d8726ce
reset broken logic with manual zoom level
Oct 8, 2018
c992605
fixing diff... again?
Oct 9, 2018
7efd884
arrow assignment operator
Oct 3, 2018
9e9a031
spaces -> tabs & = -> <-
Oct 3, 2018
44851e9
continued merge conflict resolution...
Oct 9, 2018
f9f4e30
Merge branch 'master' into zoom_max
MichaelChirico Oct 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions OpenStreetMap/R/osm.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,14 @@ plot.osmtile <- function(x, y=NULL, add=TRUE, raster=TRUE, ...){
#'
#' http://api.someplace.com/.../{z}/{x}/{y}
#'
#' When \code{zoom} is \code{NULL}, it is determined by recursively increasing
#' the zoom from 1 and checking how many tiles would be produced; the zoom
#' produced is the first zoom when at least \code{minNumTiles} are depicted.
#' This process terminates at \code{zoom = 18L} regardless of whether
#' \code{minNumTiles} has been reached.
#'
#' See here for details on setting \code{zoom} manually: https://wiki.openstreetmap.org/wiki/Zoom_levels
#'
#' @examples \dontrun{
#' #show some of the maps available
#' nm <- c("osm", "maptoolkit-topo", "bing", "stamen-toner",
Expand Down Expand Up @@ -146,10 +154,8 @@ openmap <- function(upperLeft,lowerRight,zoom=NULL,

.tryJava()
autoZoom <- is.null(zoom)
if(autoZoom)
zoom <- 1L
else
zoom <- as.integer(zoom)
zoom <- if(autoZoom) 1L else as.integer(zoom)

ts <- new(J("org.openstreetmap.gui.jmapviewer.tilesources.BingAerialTileSource"))
for(i in 1:18){
minY <- as.integer(floor(ts$latToTileY(upperLeft[1L],zoom)))
Expand All @@ -160,13 +166,15 @@ openmap <- function(upperLeft,lowerRight,zoom=NULL,
maxX <- as.integer(floor(ts$lonToTileX(lowerRight[2L],zoom)))
if( minX > maxX)
maxX <- maxX + nX
ntiles <- abs((maxX-minX+1)*(maxY-minY+1))
if(!autoZoom)
if (!autoZoom)
break
if(ntiles>=minNumTiles)

ntiles <- abs((maxX-minX+1)*(maxY-minY+1))
# #3 -- don't increment if we've reached 18 & not minNumTiles
if(ntiles>=minNumTiles || i == 18L)
break
else
zoom <- as.integer(zoom + 1L)

zoom <- zoom + 1L
}
map <- list(tiles=list())
for( x in minX:maxX){
Expand Down