merge develop after cran release

Merge branch 'develop'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Author: tim-salabim

.Rbuildignore

@@ -5,3 +5,4 @@
 ^basic_small.png
 ^docs$
 ^vignettes$
+^tic.R

.travis.yml

@@ -1,27 +1,52 @@
 language: r
+sudo: required
+dist: trusty
+cache:
+  - packages
+  - ccache
+latex: false
+
+addons:
+  postgresql: "9.6"
+  apt:
+    sources:
+      - sourceline: 'ppa:ubuntugis/ubuntugis-unstable'
+    packages:
+      - libproj-dev
+      - libgeos-dev
+      - libgdal-dev
+      - libudunits2-dev
+      - postgresql-server-dev-9.6 # required for postgis installation
 
 r:
   - release
   - devel
 
-cache: packages
-
-sudo: required
-
-dist: trusty
-
 before_install:
-  - sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable --yes
-  - sudo apt-get --yes --force-yes update -qq
-  - sudo apt-get install --yes libudunits2-dev libproj-dev libgeos-dev libgdal-dev
-
-warnings_are_errors: false
-
-r_packages:
-  - rgdal
-  - roxygen2
-  - rmarkdown
-  - sf
-
-after_success:
-  - Rscript -e 'covr::codecov()'
+  # install postgis from source (required for lwgeom installation):
+  - wget http://download.osgeo.org/postgis/source/postgis-2.3.2.tar.gz
+  - (mv postgis* /tmp; cd /tmp; tar xzf postgis-2.3.2.tar.gz)
+  - (cd /tmp/postgis-2.3.2 ; ./configure; make; sudo make install)
+  # create postgis databases:
+  - sudo service postgresql restart
+  - createdb postgis
+  - psql -d postgis -c "CREATE EXTENSION postgis;"
+  - psql -d postgis -c "GRANT CREATE ON DATABASE postgis TO travis"
+  - createdb empty
+  - psql -d empty -c "CREATE EXTENSION postgis;"
+  - R -q -e 'install.packages("remotes"); remotes::install_github("ropenscilabs/tic"); tic::prepare_all_stages(); tic::before_install()'
+install: R -q -e 'tic::install()'
+script: R -q -e 'tic::script()'
+
+before_deploy: R -q -e 'tic::before_deploy()'
+deploy:
+   provider: script
+   script: R -q -e 'tic::deploy()'
+   on:
+     branch: develop
+     condition:
+       - $TRAVIS_PULL_REQUEST = false
+       - $TRAVIS_EVENT_TYPE != cron
+       - $TRAVIS_R_VERSION_STRING = release
+
+after_success: R -q -e 'tic::after_success()'

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: mapview
 Type: Package
 Title: Interactive Viewing of Spatial Data in R
-Version: 2.3.0
-Date: 2018-01-30
+Version: 2.4.0
+Date: 2018-04-28
 Authors@R: c(
       person("Tim", "Appelhans", email = "tim.appelhans@gmail.com", role = c("cre", "aut")),
       person("Florian", "Detsch", email = "florian.detsch@staff.uni-marburg.de", role = c("aut")),
@@ -13,6 +13,8 @@ Authors@R: c(
       person("Edzer", "Pebesma", role = c("ctb")),
       person("Kenton", "Russell", role = c("ctb")),
       person("Michael", "Sumner", role = c("ctb")),
+      person("Jochen", "Darley", email = "Debugger@jedimasters.de", role = c("ctb")),
+      person("Pierre", "Roudier", role = c("ctb")),
       person("Environmental Informatics Marburg", role = c("ctb"))
     )
 Maintainer: Tim Appelhans <tim.appelhans@gmail.com>
@@ -52,4 +54,5 @@ Suggests:
     rmarkdown,
     dplyr,
     testthat,
-    covr
+    covr,
+    lwgeom

NAMESPACE

@@ -4,10 +4,10 @@ export(addExtent)
 export(addFeatures)
 export(addHomeButton)
 export(addImageQuery)
-export(addLargeFeatures)
 export(addLogo)
+export(addMapPane)
 export(addMouseCoordinates)
-export(addStarsImage)
+export(addStaticLabels)
 export(coords2JSON)
 export(coords2Lines)
 export(coords2Polygons)

NEWS

@@ -1,3 +1,24 @@
+mapview 2.4.0
+
+new features:
+
+  * addImageQuery has gained argument prefix to modify the layerId prefix.
+  * mapview methods for raster data have gained arguments label, query.type, query.digits, query.position and query.prefix to modify raster value query settings. https://twitter.com/pierreroudier/status/958476875344392193
+  * popupTable now right aligns values.
+  * Thanks to Pierre Roudier quantile strectching in viewRGB can now be turned off by simply setting to NULL. #127
+  * mapshot has gained argument remove_controls to remove map junk when saving to image file format.
+  * mapview method for data.frame has gained argument crs to enable rendering on a basemap #138
+  * updated to work with leaflet 2.0.0 #129 (incl. deprecation of previously used large methods)
+  * new function addMapPane to enable control over layer order.
+  * mapview has gained argument pane as it now uses addMapPane to ensure points overlay lines overlay polygons.
+  * mapview has gained argument canvas to enable canvas rendering.
+  
+bugfixes:
+
+  * viewRGB failed because of missing method argument. #125
+  * combineExtent didn't check properly for crs and failed for raster images.
+
+
 mapview 2.3.0
 
 new features:

NEWS.md

@@ -1,3 +1,24 @@
+## mapview 2.4.0
+
+new features:
+
+  * addImageQuery has gained argument prefix to modify the layerId prefix.
+  * mapview methods for raster data have gained arguments label, query.type, query.digits, query.position and query.prefix to modify raster value query settings. https://twitter.com/pierreroudier/status/958476875344392193
+  * popupTable now right aligns values.
+  * Thanks to Pierre Roudier quantile strectching in viewRGB can now be turned off by simply setting to NULL. #127
+  * mapshot has gained argument remove_controls to remove map junk when saving to image file format.
+  * mapview method for data.frame has gained argument crs to enable rendering on a basemap #138
+  * updated to work with leaflet 2.0.0 #129 (incl. deprecation of previously used large methods)
+  * new function addMapPane to enable control over layer order.
+  * mapview has gained argument pane as it now uses addMapPane to ensure points overlay lines overlay polygons.
+  * mapview has gained argument canvas to enable canvas rendering.
+  
+bugfixes:
+
+  * viewRGB failed because of missing method argument. #125
+  * combineExtent didn't check properly for crs and failed for raster images.
+
+
 ## mapview 2.3.0
 
 new features: