This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mkgmap.

commit 00d95662a76bdabec599eccc9211fac20d98a7e9
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Sat Aug 1 12:00:32 2015 +0200

    Imported Upstream version 0.0.0+svn3625
---
 mkgmap.iml                                         | 38 ++++++++++++++--------
 resources/mkgmap-version.properties                |  4 +--
 src/uk/me/parabola/imgfmt/app/mdr/Mdr7.java        |  3 ++
 src/uk/me/parabola/imgfmt/app/net/RoadNetwork.java |  2 +-
 .../parabola/mkgmap/osmstyle/StyledConverter.java  |  4 ++-
 5 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/mkgmap.iml b/mkgmap.iml
index b36fc90..a09fee6 100644
--- a/mkgmap.iml
+++ b/mkgmap.iml
@@ -39,12 +39,20 @@
     <orderEntry type="module-library">
       <library name="IvyIDEA">
         <CLASSES>
-          <root 
url="jar://$USER_HOME$/.ivy2/cache/com.google.protobuf/protobuf-java/jars/protobuf-java-2.4.1.jar!/"
 />
-          <root 
url="jar://$USER_HOME$/.ivy2/cache/crosby/osmpbf/jars/osmpbf-1.1.1-754a33af.jar!/"
 />
-          <root 
url="jar://$USER_HOME$/.ivy2/cache/com.ibm.icu/icu4j/jars/icu4j-4.8.jar!/" />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/com.google.protobuf/protobuf-java/bundles/protobuf-java-2.5.0.jar!/"
 />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/crosby/osmpbf/jars/osmpbf-1.3.3.jar!/" />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/it.unimi.dsi/fastutil/jars/fastutil-6.5.15-mkg.1b.jar!/"
 />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/junit/junit/jars/junit-4.11.jar!/" />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/org.hamcrest/hamcrest-core/jars/hamcrest-core-1.3.jar!/"
 />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/com.ibm.icu/icu4j/jars/icu4j-53.1.jar!/" />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/org.apache.ant/ant/jars/ant-1.8.2.jar!/" />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/javax.media.jai/com.springsource.javax.media.jai.codec/jars/com.springsource.javax.media.jai.codec-1.1.3.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/javax.media.jai/com.springsource.javax.media.jai.core/jars/com.springsource.javax.media.jai.core-1.1.3.jar!/"
 />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/uk.org.mkgmap/splitter/jars/splitter-412.jar!/"
 />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/xpp3/xpp3/jars/xpp3-1.1.4c.jar!/" />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/org.testng/testng/jars/testng-6.8.8.jar!/" />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/org.beanshell/bsh/jars/bsh-2.0b4.jar!/" />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/com.beust/jcommander/jars/jcommander-1.27.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/org.geotools/gt-api/jars/gt-api-2.7.5.jar!/" 
/>
           <root 
url="jar://$USER_HOME$/.ivy2/cache/com.vividsolutions/jts/jars/jts-1.11.jar!/" 
/>
           <root 
url="jar://$USER_HOME$/.ivy2/cache/xerces/xercesImpl/jars/xercesImpl-2.7.1.jar!/"
 />
@@ -57,33 +65,36 @@
           <root 
url="jar://$USER_HOME$/.ivy2/cache/org.geotools/gt-cql/jars/gt-cql-2.7.5.jar!/" 
/>
           <root 
url="jar://$USER_HOME$/.ivy2/cache/org.geotools/gt-main/jars/gt-main-2.7.5.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/jdom/jdom/jars/jdom-1.0.jar!/" />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/org.geotools/gt-shapefile/jars/gt-shapefile-2.7.5.jar!/"
 />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/org.geotools/gt-data/jars/gt-data-2.7.5.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/innig/macker/jars/macker-0.4.2.jar!/" />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/commons-lang/commons-lang/jars/commons-lang-1.0.1.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/innig/innig-util/jars/innig-util-0.4.2.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/bcel/bcel/jars/bcel-5.1.jar!/" />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/regexp/regexp/jars/regexp-1.2.jar!/" />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/jdom/jdom/jars/jdom-b9.jar!/" />
-          <root 
url="jar://$USER_HOME$/.ivy2/cache/it.unimi.dsi/fastutil/jars/fastutil-6.5.2-mkg.1.jar!/"
 />
-          <root 
url="jar://$USER_HOME$/.ivy2/cache/org.geotools/gt-shapefile/jars/gt-shapefile-2.7.5.jar!/"
 />
-          <root 
url="jar://$USER_HOME$/.ivy2/cache/org.geotools/gt-data/jars/gt-data-2.7.5.jar!/"
 />
-          <root 
url="jar://$USER_HOME$/.ivy2/cache/junit/junit/jars/junit-4.11.jar!/" />
-          <root 
url="jar://$USER_HOME$/.ivy2/cache/org.hamcrest/hamcrest-core/jars/hamcrest-core-1.3.jar!/"
 />
         </CLASSES>
         <JAVADOC>
-          <root 
url="jar://$USER_HOME$/.ivy2/cache/com.google.protobuf/protobuf-java/javadocs/protobuf-java-2.4.1-javadoc.jar!/"
 />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/com.google.protobuf/protobuf-java/javadocs/protobuf-java-2.5.0-javadoc.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/junit/junit/javadocs/junit-4.11-javadoc.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/org.hamcrest/hamcrest-core/javadocs/hamcrest-core-1.3-javadoc.jar!/"
 />
-          <root 
url="jar://$USER_HOME$/.ivy2/cache/com.ibm.icu/icu4j/javadocs/icu4j-4.8-javadoc.jar!/"
 />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/com.ibm.icu/icu4j/javadocs/icu4j-53.1-javadoc.jar!/"
 />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/xpp3/xpp3/javadocs/xpp3-1.1.4c-javadoc.jar!/"
 />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/org.testng/testng/javadocs/testng-6.8.8-javadoc.jar!/"
 />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/com.beust/jcommander/javadocs/jcommander-1.27-javadoc.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/com.vividsolutions/jts/javadocs/jts-1.11-javadoc.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/commons-pool/commons-pool/javadocs/commons-pool-1.5.4-javadoc.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/net.java.dev.jsr-275/jsr-275/javadocs/jsr-275-1.0-beta-2-javadoc.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/commons-lang/commons-lang/javadocs/commons-lang-1.0.1-javadoc.jar!/"
 />
         </JAVADOC>
         <SOURCES>
-          <root 
url="jar://$USER_HOME$/.ivy2/cache/com.google.protobuf/protobuf-java/sources/protobuf-java-2.4.1-sources.jar!/"
 />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/com.google.protobuf/protobuf-java/sources/protobuf-java-2.5.0-sources.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/junit/junit/sources/junit-4.11-sources.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/org.hamcrest/hamcrest-core/sources/hamcrest-core-1.3-sources.jar!/"
 />
-          <root 
url="jar://$USER_HOME$/.ivy2/cache/com.ibm.icu/icu4j/sources/icu4j-4.8-sources.jar!/"
 />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/com.ibm.icu/icu4j/sources/icu4j-53.1-sources.jar!/"
 />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/xpp3/xpp3/sources/xpp3-1.1.4c-sources.jar!/" 
/>
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/org.testng/testng/sources/testng-6.8.8-sources.jar!/"
 />
+          <root 
url="jar://$USER_HOME$/.ivy2/cache/com.beust/jcommander/sources/jcommander-1.27-sources.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/org.geotools/gt-api/sources/gt-api-2.7.5-sources.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/com.vividsolutions/jts/sources/jts-1.11-sources.jar!/"
 />
           <root 
url="jar://$USER_HOME$/.ivy2/cache/org.geotools/gt-referencing/sources/gt-referencing-2.7.5-sources.jar!/"
 />
@@ -101,5 +112,4 @@
       </library>
     </orderEntry>
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/resources/mkgmap-version.properties 
b/resources/mkgmap-version.properties
index 63d1375..82f30ff 100644
--- a/resources/mkgmap-version.properties
+++ b/resources/mkgmap-version.properties
@@ -1,2 +1,2 @@
-svn.version: 3620
-build.timestamp: 2015-06-10T11:09:22+0100
+svn.version: 3625
+build.timestamp: 2015-07-28T16:04:06+0100
diff --git a/src/uk/me/parabola/imgfmt/app/mdr/Mdr7.java 
b/src/uk/me/parabola/imgfmt/app/mdr/Mdr7.java
index 1709975..f5034a8 100644
--- a/src/uk/me/parabola/imgfmt/app/mdr/Mdr7.java
+++ b/src/uk/me/parabola/imgfmt/app/mdr/Mdr7.java
@@ -55,6 +55,9 @@ public class Mdr7 extends MdrMapSection {
        }
 
        public void addStreet(int mapId, String name, int lblOffset, int 
strOff, Mdr5Record mdrCity) {
+               if (name.isEmpty())
+                       return;
+
                // Find a name prefix, which is either a shield or a word 
ending 0x1e. We are treating
                // a shield as a prefix of length one.
                int prefix = 0;
diff --git a/src/uk/me/parabola/imgfmt/app/net/RoadNetwork.java 
b/src/uk/me/parabola/imgfmt/app/net/RoadNetwork.java
index cad0bcb..98d2ce5 100644
--- a/src/uk/me/parabola/imgfmt/app/net/RoadNetwork.java
+++ b/src/uk/me/parabola/imgfmt/app/net/RoadNetwork.java
@@ -149,7 +149,7 @@ public class RoadNetwork {
                                if(co.equals(reverseBearingPoint)) {
                                        // bearing point is too close to this 
node to be
                                        // useful - try some more points
-                                       for(int bi = index - 2; bi > lastIndex; 
--bi) {
+                                       for(int bi = index - 2; bi >= 
lastIndex; --bi) {
                                                
if(!co.equals(coordList.get(bi))) {
                                                        reverseBearingPoint = 
coordList.get(bi);
                                                        break;
diff --git a/src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java 
b/src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java
index 81a5673..2a827ca 100644
--- a/src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java
+++ b/src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java
@@ -264,6 +264,7 @@ public class StyledConverter implements OsmConverter {
                if (way.getPoints().size() < 2 || way.getTagCount() == 0){
                        // no tags or no points => nothing to convert
                        removeRestrictionsWithWay(Level.WARNING, way, "is 
ignored");
+                       return;
                }
                preConvertRules(way);
 
@@ -1012,7 +1013,8 @@ public class StyledConverter implements OsmConverter {
                        }
                        else {
                                mp = new MapPoint();
-                               log.warn("Motorway exit", node.getName(), "(" + 
node.toBrowseURL() + ") has no motorway! (either make the exit share a node 
with the motorway or specify the motorway ref with a", Exit.TAG_ROAD_REF, 
"tag)");
+                               if 
("motorway_junction".equals(node.getTag("highway")))
+                                       log.warn("Motorway exit", 
node.getName(), "(" + node.toBrowseURL() + ") has no (motorway) ref! (either 
make the exit share a node with the motorway or specify the motorway ref with 
a", Exit.TAG_ROAD_REF, "tag)");
                        }
                }
                else {

-- 
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

Reply via email to