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 1 commit
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
Prev Previous commit
Next Next commit
reset broken logic with manual zoom level 
minor simplification
  • Loading branch information
Michael Chirico committed Oct 8, 2018
commit d8726cec4665805d0cb950122b9de144e079bc66
35 changes: 19 additions & 16 deletions OpenStreetMap/R/osm.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,24 +161,27 @@ openmap <- function(upperLeft,lowerRight,zoom=NULL,type=c("osm","osm-bw","maptoo
}
.tryJava()
autoZoom <- is.null(zoom)
zoom <- if(autoZoom) 0L else as.integer(zoom)
zoom <- if(autoZoom) 1L else as.integer(zoom)

ts <- new(J("org.openstreetmap.gui.jmapviewer.tilesources.BingAerialTileSource"))
if (autoZoom) {
for(i in 1:18){
zoom <- zoom + 1L
minY <- as.integer(floor(ts$latToTileY(upperLeft[1],zoom)))
maxY <- as.integer(floor(ts$latToTileY(lowerRight[1],zoom)))

nX <- as.integer(round(ts$lonToTileX(180,zoom)))
minX <- as.integer(floor(ts$lonToTileX(upperLeft[2],zoom)))
maxX <- as.integer(floor(ts$lonToTileX(lowerRight[2],zoom)))
if( minX > maxX)
maxX <- maxX + nX
ntiles <- abs((maxX-minX+1)*(maxY-minY+1))
if(ntiles>=minNumTiles)
break
}
for(i in 1:18){
minY <- as.integer(floor(ts$latToTileY(upperLeft[1],zoom)))
maxY <- as.integer(floor(ts$latToTileY(lowerRight[1],zoom)))

nX <- as.integer(round(ts$lonToTileX(180,zoom)))
minX <- as.integer(floor(ts$lonToTileX(upperLeft[2],zoom)))
maxX <- as.integer(floor(ts$lonToTileX(lowerRight[2],zoom)))
if( minX > maxX)
maxX <- maxX + nX
if (!autoZoom)
break

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

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