Skip to content

Commit

Permalink
version 2.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
adeckmyn authored and cran-robot committed Mar 30, 2018
1 parent e71661f commit b1a75fd
Show file tree
Hide file tree
Showing 50 changed files with 41,436 additions and 80 deletions.
8 changes: 4 additions & 4 deletions DESCRIPTION 100755 → 100644
@@ -1,7 +1,7 @@
Package: mapdata
Title: Extra Map Databases
Version: 2.2-6
Date: 2016-01-12
Version: 2.3.0
Date: 2018-03-29
Author: Original S code by Richard A. Becker and Allan R. Wilks.
R version by Ray Brownrigg <Ray.Brownrigg@ecs.vuw.ac.nz>.
Description: Supplement to maps package, providing the larger and/or
Expand All @@ -11,6 +11,6 @@ LazyData: yes
License: GPL-2
Maintainer: Alex Deckmyn <alex.deckmyn@meteo.be>
NeedsCompilation: yes
Packaged: 2018-03-30 10:58:56 UTC; dalex
Repository: CRAN
Packaged: 2016-01-14 11:00:54 UTC; dalex
Date/Publication: 2016-01-14 13:12:17
Date/Publication: 2018-03-30 13:12:08 UTC
35 changes: 21 additions & 14 deletions MD5
@@ -1,25 +1,27 @@
7070e804256b556f4bff9d870fc1c1a4 *DESCRIPTION
5dde430281743059510b310fc53efd2e *DESCRIPTION
6261b42b8ec8377db807467060a3712d *NAMESPACE
f8ef151d048e332371fc71e06493307b *R/zzz.R
bb41a07b00de367aa7d953620868aa2e *cleanup
759880328f23218f20e80e3897145c9a *configure
6ae0ac65d0d11b8de6f78ffaf6a5b200 *configure.ac
1cfc8d1be8541faac2809ad7f444ef7d *data/chinaMapEnv.rda
95b32710c7ab59d2b37714cdb625f845 *data/japanMapEnv.rda
3b4514432117dd770f98619765bcd72c *data/nzHiresMapEnv.rda
e3525ea9401762f37ca188338472b088 *data/riversMapEnv.rda
6beafceaa939f3c29523a3a8201c221a *data/world2HiresMapEnv.rda
c1ec0b77a62d0672d909435b11a777af *data/worldHiresMapEnv.rda
26c74e25521cb0b59d625e8a687cf643 *configure
3e4c11219bbdbcdf39ce908959a0d4de *configure.ac
e59d10651af8b29b44908e044bc3d1da *data/chinaMapEnv.rda
e7d89eeef8b56c33b33bfa6e11de4e6f *data/japanMapEnv.rda
5d4bab4209223a239515e57f84217be8 *data/nzHiresMapEnv.rda
651d5f7ac44ab768b602641fd9095752 *data/riversMapEnv.rda
192a9582be40764a2cb23cd57b32f47c *data/world2HiresMapEnv.rda
1bddf8d9426a490cb7d83ac5908e0a42 *data/world2LoresMapEnv.rda
bbd4cdab0c115632eaa48e935ad87bee *data/worldHiresMapEnv.rda
f915296d05cfdccf49af43778d3381d4 *data/worldLoresMapEnv.rda
8a83ed06ef809cd066342c1ccf3a6786 *man/china.Rd
12d4c9ca2dbc3c86d0ac1f557515f485 *man/japan.Rd
0272938e2eb7289110e856176f64ac11 *man/nzHires.Rd
349c989b09ea2952a39f38eaeeafd92f *man/rivers.Rd
11ea3d71cca676c6bc81f0a4722b7234 *man/world2Hires.Rd
7f418861cc4c131bcec1c25135890e04 *man/worldHires.Rd
e8877fb63ff7f9fb3f786c0342279e5a *man/world2Hires.Rd
cff9af5266a19e84fa2bc14a26d5693e *man/worldHires.Rd
eccd234607d07a4bb8470fb29acdac41 *src/Gmake.c
4e6736aa698e81a165bbe6052ae3bf8e *src/Lmake.c
79eeda712fd74bdab97eb5912cc17ea4 *src/Makefile.in
404958ee0ef0b7a0f63b5299cbfad01a *src/Makefile.win
a5d3be6b4d377ee779b3f90e8e9ef571 *src/Makefile.in
d3d4de46039c709443fb676a211aaef0 *src/Makefile.win
acea2ae57cdaf32478bc1b4c23dacb7a *src/README
981a7c2653b7962753f256cb493a1e75 *src/china.gon
75bf804e758ca097d635def587aa0f2b *src/china.gonstats
Expand Down Expand Up @@ -48,4 +50,9 @@ d663fc8e20d4109aa313846d203bfd77 *src/rivers.linestats
0902fc2c7b181fbf40673b9d9748ad00 *src/worldHires.gonstats
f63eb6174464c2baefc3630e45cb7471 *src/worldHires.line
a22b40ea95d2ede319743f6bb20a1ab6 *src/worldHires.linestats
68f03e9284badbce449db64b3f2c0370 *src/worldHires.name
f0dbcd1e86cba7c5de44bf2b92f51ee2 *src/worldHires.name
f1a1b6c9257c30aed9625a01dcec660b *src/worldLores.gon
0902fc2c7b181fbf40673b9d9748ad00 *src/worldLores.gonstats
76e802969266838ed27ee0a27f05ba80 *src/worldLores.line
a92ae175e549ef37cdcd565b97dac430 *src/worldLores.linestats
f0dbcd1e86cba7c5de44bf2b92f51ee2 *src/worldLores.name
Empty file modified NAMESPACE 100755 → 100644
Empty file.
Empty file modified R/zzz.R 100755 → 100644
Empty file.
32 changes: 22 additions & 10 deletions configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for mapdata 2.2-6.
# Generated by GNU Autoconf 2.69 for mapdata 2.2-8.
#
# Report bugs to <alex.deckmyn@meteo.be>.
#
Expand Down Expand Up @@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='mapdata'
PACKAGE_TARNAME='mapdata'
PACKAGE_VERSION='2.2-6'
PACKAGE_STRING='mapdata 2.2-6'
PACKAGE_VERSION='2.2-8'
PACKAGE_STRING='mapdata 2.2-8'
PACKAGE_BUGREPORT='alex.deckmyn@meteo.be'
PACKAGE_URL=''

Expand All @@ -606,6 +606,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
Expand Down Expand Up @@ -670,6 +671,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
Expand Down Expand Up @@ -922,6 +924,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;

-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;

-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
Expand Down Expand Up @@ -1059,7 +1070,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
Expand Down Expand Up @@ -1172,7 +1183,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures mapdata 2.2-6 to adapt to many kinds of systems.
\`configure' configures mapdata 2.2-8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1212,6 +1223,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
Expand All @@ -1233,7 +1245,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of mapdata 2.2-6:";;
short | recursive ) echo "Configuration of mapdata 2.2-8:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1300,7 +1312,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
mapdata configure 2.2-6
mapdata configure 2.2-8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand All @@ -1317,7 +1329,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by mapdata $as_me 2.2-6, which was
It was created by mapdata $as_me 2.2-8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -2252,7 +2264,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by mapdata $as_me 2.2-6, which was
This file was extended by mapdata $as_me 2.2-8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -2305,7 +2317,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
mapdata config.status 2.2-6
mapdata config.status 2.2-8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
@@ -1,4 +1,4 @@
AC_INIT(mapdata, 2.2-6, alex.deckmyn@meteo.be)
AC_INIT(mapdata, 2.2-8, alex.deckmyn@meteo.be)
AC_PROG_AWK
AC_SUBST(AWK)
AC_CONFIG_FILES(src/Makefile)
Expand Down
Binary file modified data/chinaMapEnv.rda
Binary file not shown.
Binary file modified data/japanMapEnv.rda
Binary file not shown.
Binary file modified data/nzHiresMapEnv.rda
Binary file not shown.
Binary file modified data/riversMapEnv.rda
Binary file not shown.
Binary file modified data/world2HiresMapEnv.rda
Binary file not shown.
Binary file added data/world2LoresMapEnv.rda
Binary file not shown.
Binary file modified data/worldHiresMapEnv.rda
Binary file not shown.
Binary file added data/worldLoresMapEnv.rda
Binary file not shown.
7 changes: 6 additions & 1 deletion man/world2Hires.Rd
Expand Up @@ -2,10 +2,15 @@
\docType{data}
\alias{world2Hires}
\alias{world2HiresMapEnv}
\alias{world2Lores}
\alias{world2LoresMapEnv}
\title{
Pacific Centric World Map
}
\usage{data(world2HiresMapEnv)}
\usage{
data(world2HiresMapEnv)
data(world2LoresMapEnv)
}
\description{
This world database comes from a cleaned-up version of the CIA
World Data Bank II data and contains approximately 2 million points
Expand Down
13 changes: 9 additions & 4 deletions man/worldHires.Rd
@@ -1,13 +1,14 @@
\name{worldHires}
\docType{data}
\alias{worldHires}
\alias{worldHiresMapEnv}
\alias{worldLores}
\alias{worldLoresMapEnv}
\docType{data}
\title{
World Map
}
\usage{data(worldHiresMapEnv)}
\description{
This world database comes from a cleaned-up version of the CIA
This (legacy) world database comes from a cleaned-up version of the CIA
World Data Bank II data and contains approximately 2 million points
representing the world coastlines and national boundaries. This
makes it suitable for extracting countries, continents, etc. while
Expand All @@ -17,7 +18,11 @@ The `world2' database is a modified version of the `world' database
in which the longitude ranges from 0 through 360 degrees, instead of
-180 through 180. This then allows maps of the whole Pacific Ocean for
example.
\code{worldLores} contains exactly the same polygon information, but the boundaries have been reduced to a very low resolution.
}
\note{This database was compiled in the 1990's and does not reflect more recent political changes. It is maintained mainly for historical purposes and legacy code. The data in \code{maps::world} on in packages like \code{rnaturalearth} is much more up to date.}
\format{
The data file is merely an assignment to a character string which
specifies the name of an environment variable which contains the
Expand All @@ -26,7 +31,7 @@ This environment variable (\code{R_MAPDATA_DATA_DIR} for the datasets in the
mapdata package) is set at package load time.
}
\source{
The CIA World Data Bank II is currently (mid-2003) available from
The CIA World Data Bank II is currently (mid-2017) still available from
\url{http://www.evl.uic.edu/pape/data/WDB/}.
}
\seealso{
Expand Down
62 changes: 41 additions & 21 deletions src/Makefile.in 100755 → 100644
@@ -1,50 +1,70 @@
#-*- Makefile -*-

.SUFFIXES: .G .L .N .gon .line .name
# Some recursive calls are only there because they were needed in Makefile.win

CP = cp
ECHO = echo
RM = rm -f
PKGNAME = mapdata
MKDIR = mkdir
AWK = @AWK@

GDATA = china.G japan.G nzHires.G rivers.G worldHires.G world2Hires.G
LDATA = china.L japan.L nzHires.L rivers.L worldHires.L world2Hires.L
NDATA = china.N japan.N nzHires.N rivers.N worldHires.N world2Hires.N
.SUFFIXES: .G .L .N .gon .line .name

GDATA = china.G japan.G nzHires.G rivers.G worldHires.G world2Hires.G worldLores.G world2Lores.G
LDATA = china.L japan.L nzHires.L rivers.L worldHires.L world2Hires.L worldLores.L world2Lores.L
NDATA = china.N japan.N nzHires.N rivers.N worldHires.N world2Hires.N worldLores.N world2Lores.N
WORLD2 = world2Lores.line world2Hires.line

mapdir = ../inst/mapdata

.line.L:
@$(MKDIR) -p ../inst/mapdata
./Lmake 0 s b ${*}.line ${*}.linestats ../inst/mapdata/${*}.L
@$(MKDIR) -p $(mapdir)
./Lmake 0 s b ${*}.line ${*}.linestats $(mapdir)/${*}.L

.gon.G:
./Gmake b ${*}.gon ${*}.gonstats ../inst/mapdata/${*}.G ../inst/mapdata/${*}.L
./Gmake b ${*}.gon ${*}.gonstats $(mapdir)/${*}.G $(mapdir)/${*}.L

.name.N:
@$(MKDIR) -p ../inst/mapdata
@$(CP) ${*}.name ../inst/mapdata/${*}.N
@$(MKDIR) -p $(mapdir)
@$(CP) ${*}.name $(mapdir)/${*}.N

.PHONY: all gdata ldata ndata
.PHONY: all gdata ldata ndata world2 lmake gmake

all: gdata ndata

gdata: Gmake ldata
$(MAKE) $(GDATA)
gdata: gmake ldata
$(MAKE) -f "$(R_HOME)/etc$(R_ARCH)/Makeconf" -f Makefile $(GDATA)

ldata: Lmake world2Hires.line
$(MAKE) $(LDATA)
ldata: lmake world2
$(MAKE) -f "$(R_HOME)/etc$(R_ARCH)/Makeconf" -f Makefile $(LDATA)

ndata: world2Hires.line
$(MAKE) $(NDATA)
ndata: world2
$(MAKE) -f "$(R_HOME)/etc$(R_ARCH)/Makeconf" -f Makefile $(NDATA)

world2:
$(MAKE) -f "$(R_HOME)/etc$(R_ARCH)/Makeconf" -f Makefile $(WORLD2)

lmake:
$(MAKE) -f "$(R_HOME)/etc$(R_ARCH)/Makeconf" -f Makefile Lmake

gmake:
$(MAKE) -f "$(R_HOME)/etc$(R_ARCH)/Makeconf" -f Makefile Gmake

world2Hires.line: worldHires.line
@$(ECHO) "Converting world to world2"
$(AWK) -f convert.awk < worldHires.line > world2Hires.line
@$(ECHO) "Converting worldHires to world2Hires"
$(AWK) -f ./convert.awk < worldHires.line > world2Hires.line
@$(CP) worldHires.linestats world2Hires.linestats
@$(CP) worldHires.gon world2Hires.gon
@$(CP) worldHires.gonstats world2Hires.gonstats
@$(CP) worldHires.name world2Hires.name

world2Lores.line: worldLores.line
@$(ECHO) "Converting worldLores to world2Lores"
$(AWK) -f ./convert.awk < worldLores.line > world2Lores.line
@$(CP) worldLores.linestats world2Lores.linestats
@$(CP) worldLores.gon world2Lores.gon
@$(CP) worldLores.gonstats world2Lores.gonstats
@$(CP) worldLores.name world2Lores.name

clean:
$(RM) Gmake Lmake ../inst/mapdata/* world2Hires.* $(PKGNAME).s[lo] $(PKGNAME).dylib *.exe
$(RM) Gmake Lmake $(mapdir)/* world2*
$(RM) -r ../inst

0 comments on commit b1a75fd

Please sign in to comment.