This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mkgmap.
commit 30a906102540025aa11058d0cc2092399357a0a4
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Fri Oct 2 12:47:10 2015 +0200
Imported Upstream version 0.0.0+svn3643
---
doc/options.txt | 3 ++-
resources/help/en/options | 1 +
resources/mkgmap-version.properties | 4 ++--
resources/styles/default/lines | 6 +++--
resources/styles/default/points | 4 ++--
src/uk/me/parabola/imgfmt/app/lbl/PlacesFile.java | 2 +-
src/uk/me/parabola/imgfmt/app/mdr/Mdr12Record.java | 1 -
src/uk/me/parabola/log/UsefulFormatter.java | 1 -
.../parabola/mkgmap/osmstyle/WrongAngleFixer.java | 1 +
src/uk/me/parabola/mkgmap/reader/dem/DEM.java | 4 ++--
.../parabola/mkgmap/reader/osm/ElementSaver.java | 26 +++++++++-------------
.../mkgmap/reader/osm/OsmReadingHooksChain.java | 1 -
.../mkgmap/reader/osm/boundary/BoundarySaver.java | 3 ---
13 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/doc/options.txt b/doc/options.txt
index 1ba8eab..adc280d 100644
--- a/doc/options.txt
+++ b/doc/options.txt
@@ -406,7 +406,8 @@ completely reliable heuristic.
When reading OSM files, ignore any "maxspeed" tags.
;--ignore-builtin-relations
-: When reading OSM files, skip the built-in processing of
+: Now ignored, former usage:
+When reading OSM files, skip the built-in processing of
relations. This speeds up the processing non-routable map
layers that do not contain multipolygons. This implies
--ignore-turn-restrictions.
diff --git a/resources/help/en/options b/resources/help/en/options
index 43d90ec..349317b 100644
--- a/resources/help/en/options
+++ b/resources/help/en/options
@@ -410,6 +410,7 @@ Miscellaneous options:
When reading OSM files, ignore any "maxspeed" tags.
--ignore-builtin-relations
+ Now ignored, former usage:
When reading OSM files, skip the built-in processing of
relations. This speeds up the processing non-routable map
layers that do not contain multipolygons. This implies
diff --git a/resources/mkgmap-version.properties
b/resources/mkgmap-version.properties
index ab841e7..20db163 100644
--- a/resources/mkgmap-version.properties
+++ b/resources/mkgmap-version.properties
@@ -1,2 +1,2 @@
-svn.version: 3639
-build.timestamp: 2015-08-31T13:34:36+0100
+svn.version: 3643
+build.timestamp: 2015-09-19T08:13:00+0100
diff --git a/resources/styles/default/lines b/resources/styles/default/lines
index 70192ce..ab89b5a 100644
--- a/resources/styles/default/lines
+++ b/resources/styles/default/lines
@@ -20,6 +20,8 @@ highway=* & (toll=yes|toll=true) { set mkgmap:toll=yes }
# Hide proposed ways
highway=proposed {delete highway;delete junction}
+# Hide removed ways
+highway=razed {deletealltags}
# Hide unaccessible tunnels
highway=* & tunnel=yes & (access=private|access=no)
& foot!=* & bicycle!=* {delete highway;delete junction}
@@ -123,7 +125,7 @@ highway=trunk & ( network=e-road | int_ref=* ) [0x02
resolution 15-17 continue]
highway=trunk [0x02 road_class=4 road_speed=5 resolution 18]
highway=trunk_link & (mkgmap:exit_hint=true | mkgmap:dest_hint=true) [0x06
road_class=3 road_speed=2 resolution 20]
highway=trunk_link [0x09 road_class=3 road_speed=2 resolution 20]
-highway=* & highway!=proposed & motorroad=yes [0x02 road_class=4 road_speed=4
resolution 18]
+highway=* & motorroad=yes [0x02 road_class=4 road_speed=4 resolution 18]
highway=primary & ( network=e-road | int_ref=* ) [0x03 resolution 17-18
continue]
highway=primary [0x03 road_class=3 road_speed=4 resolution 19]
highway=primary_link & (mkgmap:exit_hint=true | mkgmap:dest_hint=true)[0x06
road_class=3 road_speed=1 resolution 21]
@@ -158,7 +160,7 @@ highway=unsurfaced [0x0a road_class=0 road_speed=1
resolution 22]
highway=road { add mkgmap:dead-end-check = false} [0x06 road_class=0
road_speed=1 resolution 22]
# Mop up any unrecognised highway types
-highway=* & highway!=proposed & area!=yes [0x07 road_class=0 road_speed=0
resolution 23]
+highway=* & area!=yes [0x07 road_class=0 road_speed=0 resolution 23]
natural=coastline [0x15 resolution 12]
power=line [0x29 resolution 21]
diff --git a/resources/styles/default/points b/resources/styles/default/points
index bc4b7a3..fcf5688 100644
--- a/resources/styles/default/points
+++ b/resources/styles/default/points
@@ -178,7 +178,7 @@ amenity=supermarket [0x2e02 resolution 24]
amenity=taxi [0x2f17 resolution 24]
amenity=telephone [0x2f12 resolution 24 default_name 'Telephone']
amenity=theatre [0x2d01 resolution 24]
-amenity=toilets & tourism=information [0x2f0c resolution 24]
+amenity=toilets & highway=rest_area [0x2f0c resolution 24]
amenity=toilets [0x4e00 resolution 24 default_name 'Toilets' ]
amenity=townhall [0x3003 resolution 24]
amenity=university [0x2c05 resolution 24]
@@ -279,7 +279,7 @@ tourism=chalet [0x2b02 resolution 24]
tourism=guest_house [0x2b02 resolution 24]
tourism=hostel [0x2b02 resolution 24]
tourism=hotel | tourism=motel [0x2b01 resolution 24]
-tourism=information [0x2f0c resolution 24]
+tourism=information [0x4c00 resolution 24]
# tourism=lean_to replaces some uses of amenity=shelter
tourism=lean_to [0x2b05 resolution 24 default_name 'lean-to']
tourism=wilderness_hut [0x2b07 resolution 24 default_name 'wilderness hut']
diff --git a/src/uk/me/parabola/imgfmt/app/lbl/PlacesFile.java
b/src/uk/me/parabola/imgfmt/app/lbl/PlacesFile.java
index fab831f..8f49081 100644
--- a/src/uk/me/parabola/imgfmt/app/lbl/PlacesFile.java
+++ b/src/uk/me/parabola/imgfmt/app/lbl/PlacesFile.java
@@ -35,7 +35,7 @@ import uk.me.parabola.imgfmt.app.trergn.Subdivision;
* This is really part of the LBLFile. We split out all the parts of the file
* that are to do with location to here.
*/
-@SuppressWarnings({"RawUseOfParameterizedType", "unchecked", "rawtypes"})
+@SuppressWarnings({"unchecked", "rawtypes"})
public class PlacesFile {
private final Map<String, Country> countries = new LinkedHashMap<>();
private final List<Country> countryList = new ArrayList<>();
diff --git a/src/uk/me/parabola/imgfmt/app/mdr/Mdr12Record.java
b/src/uk/me/parabola/imgfmt/app/mdr/Mdr12Record.java
index 3303c7e..a370909 100644
--- a/src/uk/me/parabola/imgfmt/app/mdr/Mdr12Record.java
+++ b/src/uk/me/parabola/imgfmt/app/mdr/Mdr12Record.java
@@ -16,7 +16,6 @@ package uk.me.parabola.imgfmt.app.mdr;
* This is an index into mdr11 (pois).
* @author Steve Ratcliffe
*/
-@SuppressWarnings({"EmptyClass"})
public class Mdr12Record extends Mdr8Record {
// This is exactly the same as mdr8
}
diff --git a/src/uk/me/parabola/log/UsefulFormatter.java
b/src/uk/me/parabola/log/UsefulFormatter.java
index 19356d1..82cedb9 100644
--- a/src/uk/me/parabola/log/UsefulFormatter.java
+++ b/src/uk/me/parabola/log/UsefulFormatter.java
@@ -63,7 +63,6 @@ public class UsefulFormatter extends Formatter {
sb.append('\n');
- @SuppressWarnings({"ThrowableResultOfMethodCallIgnored"})
Throwable t = record.getThrown();
if (t != null) {
StringWriter out = new StringWriter();
diff --git a/src/uk/me/parabola/mkgmap/osmstyle/WrongAngleFixer.java
b/src/uk/me/parabola/mkgmap/osmstyle/WrongAngleFixer.java
index cc164b6..f3ee0e0 100644
--- a/src/uk/me/parabola/mkgmap/osmstyle/WrongAngleFixer.java
+++ b/src/uk/me/parabola/mkgmap/osmstyle/WrongAngleFixer.java
@@ -1233,6 +1233,7 @@ public class WrongAngleFixer {
}
// TODO: remove this debugging aid
+ @SuppressWarnings("unused")
private void createGPX(String gpxName, Map<Coord, Coord>
replacements) {
if (gpxName == null || gpxPath == null)
return;
diff --git a/src/uk/me/parabola/mkgmap/reader/dem/DEM.java
b/src/uk/me/parabola/mkgmap/reader/dem/DEM.java
index cb948db..75b5ab5 100644
--- a/src/uk/me/parabola/mkgmap/reader/dem/DEM.java
+++ b/src/uk/me/parabola/mkgmap/reader/dem/DEM.java
@@ -84,7 +84,7 @@ public abstract class DEM {
try {
String dataPath;
- Class demClass;
+ Class<?> demClass ;
switch (demType) {
case "ASTER":
dataPath = config.getProperty("dem-path",
"ASTER");
@@ -99,7 +99,7 @@ public abstract class DEM {
demClass =
Class.forName("uk.me.parabola.mkgmap.reader.dem.HGTDEM");
break;
}
- Constructor<DEM> constructor =
demClass.getConstructor(String.class,
+ Constructor<DEM> constructor = (Constructor<DEM>)
demClass.getConstructor(String.class,
Double.TYPE, Double.TYPE,
Double.TYPE, Double.TYPE);
data = constructor.newInstance(dataPath, minLat,
minLon, maxLat, maxLon);
diff --git a/src/uk/me/parabola/mkgmap/reader/osm/ElementSaver.java
b/src/uk/me/parabola/mkgmap/reader/osm/ElementSaver.java
index 1517d32..8a70b1d 100644
--- a/src/uk/me/parabola/mkgmap/reader/osm/ElementSaver.java
+++ b/src/uk/me/parabola/mkgmap/reader/osm/ElementSaver.java
@@ -65,7 +65,6 @@ public class ElementSaver {
private int maxLon = Utils.toMapUnit(-180.0);
// Options
- private final boolean ignoreBuiltinRelations;
private final boolean ignoreTurnRestrictions;
/** name of the tag that contains a ;-separated list of tagnames that
should be removed after all elements have been processed */
@@ -84,7 +83,6 @@ public class ElementSaver {
relationMap = new HashMap<Long, Relation>();
}
- ignoreBuiltinRelations =
args.getProperty("ignore-builtin-relations", false);
ignoreTurnRestrictions =
args.getProperty("ignore-turn-restrictions", false);
}
@@ -145,19 +143,17 @@ public class ElementSaver {
* @param rel The osm relation.
*/
public void addRelation(Relation rel) {
- if (!ignoreBuiltinRelations) {
- String type = rel.getTag("type");
- if (type == null) {
- } else if ("multipolygon".equals(type) ||
"boundary".equals(type)) {
- rel = createMultiPolyRelation(rel);
- } else if("restriction".equals(type) ||
type.startsWith("restriction:")) {
- if (ignoreTurnRestrictions)
- rel = null;
- else if (rel.getTag("restriction") == null &&
rel.getTagsWithPrefix("restriction:", false).isEmpty())
- log.warn("ignoring
unspecified/unsupported restriction " + rel.toBrowseURL());
- else
- rel = new RestrictionRelation(rel);
- }
+ String type = rel.getTag("type");
+ if (type == null) {
+ } else if ("multipolygon".equals(type) ||
"boundary".equals(type)) {
+ rel = createMultiPolyRelation(rel);
+ } else if("restriction".equals(type) ||
type.startsWith("restriction:")) {
+ if (ignoreTurnRestrictions)
+ rel = null;
+ else if (rel.getTag("restriction") == null &&
rel.getTagsWithPrefix("restriction:", false).isEmpty())
+ log.warn("ignoring unspecified/unsupported
restriction " + rel.toBrowseURL());
+ else
+ rel = new RestrictionRelation(rel);
}
if(rel != null) {
diff --git a/src/uk/me/parabola/mkgmap/reader/osm/OsmReadingHooksChain.java
b/src/uk/me/parabola/mkgmap/reader/osm/OsmReadingHooksChain.java
index 4529b75..2c02269 100644
--- a/src/uk/me/parabola/mkgmap/reader/osm/OsmReadingHooksChain.java
+++ b/src/uk/me/parabola/mkgmap/reader/osm/OsmReadingHooksChain.java
@@ -29,7 +29,6 @@ import uk.me.parabola.util.EnhancedProperties;
*
* @author Steve Ratcliffe
*/
-@SuppressWarnings({"ForLoopReplaceableByForEach"})
public class OsmReadingHooksChain implements OsmReadingHooks {
private static final OsmReadingHooks[] NO_HOOKS = new
OsmReadingHooks[0];
diff --git a/src/uk/me/parabola/mkgmap/reader/osm/boundary/BoundarySaver.java
b/src/uk/me/parabola/mkgmap/reader/osm/boundary/BoundarySaver.java
index e2d4a14..d1546a7 100644
--- a/src/uk/me/parabola/mkgmap/reader/osm/boundary/BoundarySaver.java
+++ b/src/uk/me/parabola/mkgmap/reader/osm/boundary/BoundarySaver.java
@@ -13,8 +13,6 @@
package uk.me.parabola.mkgmap.reader.osm.boundary;
import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntStack;
-
import java.awt.Shape;
import java.awt.geom.PathIterator;
import java.io.BufferedOutputStream;
@@ -30,7 +28,6 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/mkgmap.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
