Removing IsoCountry dependency from country code assignment when merg…

…ing relations (#211)
osmlab · Aug 31, 2018 · bee15d4 · bee15d4
1 parent 8ef8677
commit bee15d4
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/...main/java/org/openstreetmap/atlas/geography/atlas/raw/slicing/RawAtlasRelationSlicer.java b/...main/java/org/openstreetmap/atlas/geography/atlas/raw/slicing/RawAtlasRelationSlicer.java
@@ -696,9 +696,23 @@ private void mergeOverlappingClosedMembers(final Relation relation,
                         markRemovedMemberLineForDeletion(inner, relationIdentifier);
                     }
 
-                    // Set the proper country code
+                    // Get the proper country code
+                    final String countryCode;
+                    final Optional<String> possibleCountryCode = outer.getTag(ISOCountryTag.KEY);
+                    if (possibleCountryCode.isPresent())
+                    {
+                        countryCode = possibleCountryCode.get();
+                    }
+                    else
+                    {
+                        // At this point, all members are sliced and must have a country code
+                        throw new CoreException(
+                                "Relation {} contains member {} that is missing a country code",
+                                relationIdentifier, outer);
+                    }
+
                     CountryBoundaryMap.setGeometryProperty(exteriorRing, ISOCountryTag.KEY,
-                            ISOCountryTag.first(outer).get().getIso3CountryCode());
+                            countryCode);
 
                     // Create points, lines and update members
                     createNewLineMemberForRelation(exteriorRing, relationIdentifier,