Merge branch 'master' into public

Author: Peter

core/src/main/java/com/graphhopper/GraphHopper.java

@@ -198,6 +198,11 @@ public GraphHopper setCHShortcuts( String weighting )
         return this;
     }
 
+    public String getCHWeighting()
+    {
+        return chWeighting;
+    }
+
     /**
      * Disables contraction hierarchies. Enabled by default.
      */

core/src/main/java/com/graphhopper/routing/util/EncodingManager.java

@@ -33,7 +33,6 @@
 import com.graphhopper.reader.OSMTurnRelation;
 import com.graphhopper.reader.OSMTurnRelation.TurnCostTableEntry;
 import com.graphhopper.reader.OSMWay;
-import com.graphhopper.routing.util.TurnCostEncoder.NoTurnCostsEncoder;
 
 /**
  * Manager class to register encoder, assign their flag values and check objects with all encoders

core/src/main/java/com/graphhopper/storage/GraphHopperStorage.java

@@ -1413,8 +1413,8 @@ public boolean loadExisting()
             int hash = nodes.getHeader(0);
             if (hash != getClass().getName().hashCode())
             {
-                throw new IllegalStateException("Cannot load the graph - it wasn't create via "
-                        + getClass().getName() + "! " + dir);
+                throw new IllegalStateException("Cannot load the graph - use instance "
+                        + getClass().getName() + " to load it! " + dir);
             }
             nodeEntryBytes = nodes.getHeader(1 * 4);
             nodeCount = nodes.getHeader(2 * 4);

core/src/main/java/com/graphhopper/storage/StorableProperties.java

@@ -84,6 +84,9 @@ public StorableProperties put( String key, String val )
         return this;
     }
 
+    /**
+     * Before it saves this value it creates a string out of it.
+     */
     public StorableProperties put( String key, Object val )
     {
         map.put(key, val.toString());

core/src/main/java/com/graphhopper/util/StopWatch.java

@@ -60,7 +60,7 @@ public StopWatch stop()
     }
 
     /**
-     * @return the delta nanoTime in milliseconds
+     * @return the time delta in milliseconds
      */
     public long getTime()
     {

core/src/main/java/com/graphhopper/util/shapes/CoordTrig.java

@@ -51,7 +51,7 @@ public double getLat()
 
     public boolean isValid()
     {
-        return lat != Double.NaN && lon != Double.NaN;
+        return !Double.isNaN(lat) && !Double.isNaN(lon);
     }
 
     public void setValue( T t )

core/src/test/java/com/graphhopper/util/shapes/CoordTrigTest.java

@@ -0,0 +1,41 @@
+/*
+ *  Licensed to Peter Karich under one or more contributor license
+ *  agreements. See the NOTICE file distributed with this work for
+ *  additional information regarding copyright ownership.
+ *
+ *  Peter Karich licenses this file to you under the Apache License,
+ *  Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the
+ *  License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package com.graphhopper.util.shapes;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author Peter Karich
+ */
+public class CoordTrigTest
+{
+    @Test
+    public void testIsValid()
+    {
+        CoordTrig instance = new CoordTrig();
+        assertFalse(instance.isValid());
+        instance.lat = 1;
+        assertFalse(instance.isValid());
+        instance.lon = 1;
+        assertTrue(instance.isValid());
+    }
+
+}