version 3.0.0-2

cran · Oct 2, 2015 · ed07f6b · ed07f6b
1 parent 067081c
commit ed07f6b
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 32 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: maps
 Title: Draw Geographical Maps
-Version: 3.0.0-1
-Date: 2015-09-27
+Version: 3.0.0-2
+Date: 2015-10-02
 Author: Original S code by Richard A. Becker and Allan R. Wilks.
 	R version by Ray Brownrigg.
         Enhancements by Thomas P Minka and Alex Deckmyn.
@@ -15,5 +15,5 @@ License: GPL-2
 Maintainer: Alex Deckmyn <alex.deckmyn@meteo.be>
 NeedsCompilation: yes
 Repository: CRAN
-Packaged: 2015-09-27 10:33:40 UTC; alex
-Date/Publication: 2015-09-28 09:26:52
+Packaged: 2015-10-02 08:29:37 UTC; dalex
+Date/Publication: 2015-10-02 22:01:25
diff --git a/MD5 b/MD5
@@ -1,4 +1,4 @@
-0753ba76bcf9374f559f9610f3d54d79 *DESCRIPTION
+57144f77925973be438cf445b2a47822 *DESCRIPTION
 f0606d720da62d981c3fe5f3097cd888 *NAMESPACE
 c36bed0c32d29a8f4231fcee7215746b *R/db.r
 b47ae9aa3c8ee795873776c237cf8ee4 *R/iso.r
@@ -69,8 +69,8 @@ dc4668c3b67ae20d466fdb60c07be88c *man/world.cities.Rd
 561ad7b85c6694d0a45f98f7a2a78b62 *man/world2.Rd
 eccd234607d07a4bb8470fb29acdac41 *src/Gmake.c
 4e6736aa698e81a165bbe6052ae3bf8e *src/Lmake.c
-2caba7a52a2b6cda37d6357c7f41ba75 *src/Makefile
-d1ebffb0e35151ea78870f20b78320d5 *src/Makefile.win
+5971ab51893c0f7b1050b1dde17ea7e3 *src/Makefile
+e905f3bf5bc3b4f34a22305ba8eb381c *src/Makefile.win
 ee000c17ddd154301f679ce267ed4918 *src/README
 acc0367c59ce004af98b8640941ec7bd *src/convert.awk
 a977a965cbf8f703d68afaa451eb3a55 *src/county.gon
@@ -89,6 +89,7 @@ f7c622f74f28e328d3d65f265f0a26c3 *src/italy.gonstats
 0a2cf4ecf0a34ce28b2b1095cd193d22 *src/italy.line
 1495aafdb361a79248ca9c2950c57d90 *src/italy.linestats
 1ddcc46403193ad474b3934d046f10bf *src/italy.name
+885521324ea75cdfcea9d91a5afb0ec5 *src/legacy_convert.awk
 f1a1b6c9257c30aed9625a01dcec660b *src/legacy_world.gon
 0902fc2c7b181fbf40673b9d9748ad00 *src/legacy_world.gonstats
 76e802969266838ed27ee0a27f05ba80 *src/legacy_world.line
@@ -128,4 +129,4 @@ e00687fd8b955d445553fb401bf2bf3a *src/usa.linestats
 b7364358afb7427a4aa05d7c60b67fff *src/world.gonstats
 ed19bd00182b514c7a58bbc93d09d710 *src/world.line
 dcd3e4d2e362b988705782f84022ae45 *src/world.linestats
-df82ad37d84dae4c2ff01f92c846cffe *src/world.name
+842425bd803daeaffda959c0dea5c5c3 *src/world.name
diff --git a/src/Makefile b/src/Makefile
@@ -11,9 +11,13 @@ OBJS = mapget.o		\
 	smooth.o	\
 	thin.o
 
-GDATA = county.G state.G usa.G nz.G world.G world2.G italy.G france.G state.vbm.G state.carto.G
-LDATA = county.L state.L usa.L nz.L world.L world2.L italy.L france.L state.vbm.L state.carto.L
-NDATA = county.N state.N usa.N nz.N world.N world2.N italy.N france.N state.vbm.N state.carto.N
+GDATA = county.G state.G usa.G nz.G world.G world2.G italy.G france.G state.vbm.G \
+        state.carto.G legacy_world.G legacy_world2.G
+LDATA = county.L state.L usa.L nz.L world.L world2.L italy.L france.L state.vbm.L \
+        state.carto.L legacy_world.L legacy_world2.L
+NDATA = county.N state.N usa.N nz.N world.N world2.N italy.N france.N state.vbm.N \
+        state.carto.N legacy_world.N legacy_world2.N
+
 
 .line.L:
 	@$(MKDIR) -p ../inst/mapdata
@@ -28,7 +32,7 @@ NDATA = county.N state.N usa.N nz.N world.N world2.N italy.N france.N state.vbm.
 
 .PHONY: all gdata ldata ndata
 
-all: gdata ndata $(PKGNAME)$(SHLIB_EXT) legacy
+all: gdata ndata $(PKGNAME)$(SHLIB_EXT)
 
 state.carto.L: state.carto.line state.carto.linestats Lmake
 	@$(MKDIR) -p ../inst/mapdata
@@ -50,28 +54,22 @@ ndata: world2.line
 $(PKGNAME)$(SHLIB_EXT): $(OBJS)
 	$(R_HOME)/bin/R CMD SHLIB -o $(PKGNAME)$(SHLIB_EXT) $(OBJS)
 
-world2.line: world.line
+world2.line: world.line legacy_world.line
 	@$(ECHO) "Converting world to world2"
 	$(AWK) -f convert.awk < world.line > world2.line
 	@$(CP) world.linestats world2.linestats
 	@$(CP) world.gon world2.gon
 	@$(CP) world.gonstats world2.gonstats
 	@$(CP) world.name world2.name
-
-# temporarily, we include the old (1990) world map 
-legacy: legacy_world.line Lmake Gmake
-	@$(ECHO) "Creating legacy world databases"
-	@$(MKDIR) -p ../inst/mapdata
-	$(AWK) -f convert.awk < legacy_world.line > legacy_world2.line
-	./Lmake 0 s b legacy_world.line legacy_world.linestats ../inst/mapdata/legacy_world.L
-	./Lmake 0 s b legacy_world2.line legacy_world.linestats ../inst/mapdata/legacy_world2.L
-	./Gmake b legacy_world.gon legacy_world.gonstats ../inst/mapdata/legacy_world.G ../inst/mapdata/legacy_world.L
-	./Gmake b legacy_world.gon legacy_world.gonstats ../inst/mapdata/legacy_world2.G ../inst/mapdata/legacy_world2.L
-	@$(CP) legacy_world.name ../inst/mapdata/legacy_world.N
-	@$(CP) legacy_world.name ../inst/mapdata/legacy_world2.N
-	$(RM)  legacy_world2.line 
+	@$(ECHO) "Creating legacy world2 database"
+	$(AWK) -f legacy_convert.awk < legacy_world.line > legacy_world2.line
+	@$(CP) legacy_world.linestats legacy_world2.linestats
+	@$(CP) legacy_world.gon legacy_world2.gon
+	@$(CP) legacy_world.gonstats legacy_world2.gonstats
+	@$(CP) legacy_world.name legacy_world2.name
 
 
 clean:
 	$(RM) $(OBJS) Gmake Lmake world2.* $(PKGNAME).s[lo] $(PKGNAME).dylib *.exe maps.dll symbols.rds
 	$(RM) -r ../inst/mapdata ../libs
+	$(RM) legacy_world2.*
diff --git a/src/Makefile.win b/src/Makefile.win
@@ -14,9 +14,12 @@ OBJS = mapget.o		\
 	smooth.o	\
 	thin.o
 
-GDATA = county.G state.G usa.G nz.G world.G world2.G italy.G france.G state.vbm.G state.carto.G
-LDATA = county.L state.L usa.L nz.L world.L world2.L italy.L france.L state.vbm.L state.carto.L
-NDATA = county.N state.N usa.N nz.N world.N world2.N italy.N france.N state.vbm.N state.carto.N
+GDATA = county.G state.G usa.G nz.G world.G world2.G italy.G france.G state.vbm.G \
+        state.carto.G legacy_world.G legacy_world2.G
+LDATA = county.L state.L usa.L nz.L world.L world2.L italy.L france.L state.vbm.L \
+        state.carto.L legacy_world.L legacy_world2.L
+NDATA = county.N state.N usa.N nz.N world.N world2.N italy.N france.N state.vbm.N \
+        state.carto.N legacy_world.N legacy_world2.N
 
 .line.L:
 	@$(MKDIR) -p ../inst/mapdata
@@ -58,14 +61,21 @@ $(DLLNAME).dll: $(OBJS)
 ../libs$(R_ARCH):
 	$(MKDIR) -p $@
 
-world2.line: world.line
+world2.line: world.line legacy_world.line
 	@$(ECHO) "Converting world to world2"
 	$(AWK) -f convert.awk < world.line > world2.line
 	@$(CP) world.linestats world2.linestats
 	@$(CP) world.gon world2.gon
 	@$(CP) world.gonstats world2.gonstats
 	@$(CP) world.name world2.name
+	@$(ECHO) "Creating legacy world2 database"
+	$(AWK) -f legacy_convert.awk < legacy_world.line > legacy_world2.line
+	@$(CP) legacy_world.linestats legacy_world2.linestats
+	@$(CP) legacy_world.gon legacy_world2.gon
+	@$(CP) legacy_world.gonstats legacy_world2.gonstats
+	@$(CP) legacy_world.name legacy_world2.name
 
 clean:
 	$(RM) $(DLLNAME).dll *.a $(OBJS) *.rc Gmake.exe Lmake.exe ../libs$(R_ARCH)/$(DLLNAME).dll world2.*
-	$(RM) -r ../libs$(R_ARCH) ../inst
+	$(RM) -r ../libs$(R_ARCH) ../inst/mapdata
+	$(RM) legacy_world2.*
diff --git a/src/legacy_convert.awk b/src/legacy_convert.awk
@@ -0,0 +1,3 @@
+{if (length ($1) < 5) print $0; else
+  {if ($1<0) $1 += 2*3.14159265;
+  print sprintf("%10f%10f", $1, $2); };}
diff --git a/src/world.name b/src/world.name
@@ -731,7 +731,7 @@ Indonesia:Larat	730
 Indonesia:28	731
 Indonesia:Damar	732
 Indonesia:30	733
-Indonesia:Pulau Bangka	734
+Indonesia:31	734
 Indonesia:Kangean	735
 Indonesia:33	736
 Indonesia:Panaitan	737