feat: set "ors:country" way tags

Author: aoles

ors-engine/src/main/java/org/heigit/ors/config/profile/BuildProperties.java

@@ -233,6 +233,9 @@ private void handleTrailDifficulty() {
     }
 
     private void handleBorder() {
+        if (encodedValues.getCountry() == null) {
+            encodedValues.setCountry(true);
+        }
         if (encodedValues.getBorder() == null) {
             encodedValues.setBorder(true);
         }

ors-engine/src/main/java/org/heigit/ors/config/profile/EncodedValuesProperties.java

@@ -67,6 +67,8 @@ public class EncodedValuesProperties {
     private Boolean mtbScale;
     @JsonProperty(MtbScaleUphill.KEY)
     private Boolean mtbScaleUphill;
+    @JsonProperty(Country.KEY)
+    private Boolean country;
     @JsonProperty(Border.KEY)
     private Boolean border;
 
@@ -105,6 +107,7 @@ private Map<String, Boolean> getProperties() {
         properties.put(SacScale.KEY, sacScale);
         properties.put(MtbScale.KEY, mtbScale);
         properties.put(MtbScaleUphill.KEY, mtbScaleUphill);
+        properties.put(Country.KEY, country);
         properties.put(Border.KEY, border);
 
         return properties;
@@ -148,6 +151,7 @@ public void merge(EncodedValuesProperties other) {
         sacScale = ofNullable(this.sacScale).orElse(other.sacScale);
         mtbScale = ofNullable(this.mtbScale).orElse(other.mtbScale);
         mtbScaleUphill = ofNullable(this.mtbScaleUphill).orElse(other.mtbScaleUphill);
+        country = ofNullable(this.country).orElse(other.country);
         border = ofNullable(this.border).orElse(other.border);
     }
 }

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/ORSOSMReader.java

@@ -421,8 +421,6 @@ protected void setArtificialWayTags(PointList pointList, ReaderWay way) {
         if (hillIndexCalculator != null) {
             calculateHillIndex(pointList, way);
         }
-
-        //TODO: set country "ors:country" tags before calling CountryParser
     }
 
     private void calculateHillIndex(PointList pointList, ReaderWay way) {

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/borders/CountryBordersReader.java

@@ -13,6 +13,7 @@
  */
 package org.heigit.ors.routing.graphhopper.extensions.reader.borders;
 
+import com.graphhopper.routing.ev.Country;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
@@ -43,6 +44,7 @@ public class CountryBordersReader implements Serializable {
     private final HashMap<String, CountryInfo> ids = new HashMap<>();
     private final HashMap<String, ArrayList<String>> openBorders = new HashMap<>();
     private final Map<String, Short> isoCodes = new HashMap<>();
+    private final Map<Short, Country> countries = new HashMap<>();
     private Map<Short, String> names = new HashMap<>();
     private final HashMap<Long, CountryBordersHierarchy> hierarchies = new HashMap<>();
 
@@ -422,10 +424,26 @@ private void readIds() {
                 LOGGER.warn((countries - isoCCA3) + " countries have no ISO 3166-1 CCA3 code assigned.");
             } else {
                 LOGGER.info("ISO 3166-1 CCA3 codes enabled for all countries");
+                createCountryMap();
             }
         }
     }
 
+    private void createCountryMap() {
+        for (Map.Entry<String, Short> entry : isoCodes.entrySet()) {
+            String code = entry.getKey();
+            Short id = entry.getValue();
+            if (code.length() == 3) {
+                countries.put(id, Country.valueOf(code));
+            }
+        }
+    }
+
+    public Country getCountry(short id) {
+        return countries.getOrDefault(id, Country.MISSING);
+    }
+
+
     /**
      * Read information about whether a border between two countries is open. If a border is in the file, then it is
      * an open border.

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/util/parsers/BorderParser.java

@@ -126,6 +126,10 @@ public IntsRef handleWayTags(int fromIndex, int toIndex, IntsRef edgeFlags, Read
             countryId2 = getCountryIdFromWay(way, TAG_KEY_COUNTRY2);
         }
 
+        short countryId = countryId1 == 0 ? countryId2 : countryId1;
+
+        if (countryId != 0)
+            way.setTag("ors:country", cbReader.getCountry(countryId));
         borderEnc.setEnum(false, edgeFlags, getBorderType(countryId1, countryId2));
 
         return edgeFlags;