Merge remote-tracking branch 'origin/feature--#349-list-countries' in…

…to feature--#349-list-countries # Conflicts: # openrouteservice/src/main/java/heigit/ors/routing/graphhopper/extensions/storages/builders/BordersGraphStorageBuilder.java
GIScience · May 20, 2019 · 099c75e · 099c75e
2 parents 7013b5f + 6ba8c30
commit 099c75e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/openrouteservice/src/main/java/heigit/ors/routing/RouteExtraInfoFlag.java b/openrouteservice/src/main/java/heigit/ors/routing/RouteExtraInfoFlag.java
@@ -84,6 +84,9 @@ public static int getFromString(String value) {
                 case "countryinfo":
                     res |= CountryInfo;
                     break;
+                case "countryinfo":
+                    res |= CountryInfo;
+                    break;
             }
         }
 

diff --git a/...igit/ors/routing/graphhopper/extensions/storages/builders/BordersGraphStorageBuilder.java b/...igit/ors/routing/graphhopper/extensions/storages/builders/BordersGraphStorageBuilder.java
@@ -155,8 +155,7 @@ public void processEdge(ReaderWay way, EdgeIteratorState edge) {
              try {
                  start = Short.parseShort(cbReader.getId(startVal));
                  end = Short.parseShort(cbReader.getId(endVal));
-             } catch (Exception ex) {
-                 LOGGER.info("Skipping country borders for edge: " + edge.getEdge());
+             } catch (Exception ignore) {
              } finally {
                  if (start != end) {
                      type = (cbReader.isOpen(cbReader.getEngName(startVal), cbReader.getEngName(endVal))) ? (short) 2 : (short) 1;