countries: avoid problems for BE and NL

Author: karussell

core/src/main/java/com/graphhopper/routing/ev/Country.java

@@ -43,7 +43,7 @@ public enum Country {
     AUT("Austria", "AUT", "AT"),
     AZE("Azerbaijan", "AZE", "AZ"),
     BDI("Burundi", "BDI", "BI"),
-    BEL("Belgium", "BEL", "BE", BE_BRU, BE_VLG, BE_WAL),
+    BEL("Belgium", "BEL", "BE"),
     BEN("Benin", "BEN", "BJ"),
     BFA("Burkina Faso", "BFA", "BF"),
     BGD("Bangladesh", "BGD", "BD"),
@@ -172,7 +172,7 @@ public enum Country {
     NGA("Nigeria", "NGA", "NG"),
     NIC("Nicaragua", "NIC", "NI"),
     NIU("Niue", "NIU", "NU"),
-    NLD("Netherlands", "NLD", "NL", NL_BQ1, NL_BQ2, NL_BQ3),
+    NLD("Netherlands", "NLD", "NL"),
     NOR("Norway", "NOR", "NO"),
     NPL("Nepal", "NPL", "NP"),
     NRU("Nauru", "NRU", "NR"),

core/src/main/java/com/graphhopper/routing/ev/State.java

@@ -18,10 +18,10 @@ public enum State {
     AU_VIC("AU-VIC", AUS),
     AU_WA("AU-WA", AUS),
 
-    // Belgium
-    BE_BRU("BE-BRU", BEL),
-    BE_VLG("BE-VLG", BEL),
-    BE_WAL("BE-WAL", BEL),
+    // the sub regions of Belgium have no data in countries.geojson
+    // BE_BRU("BE-BRU", BEL),
+    // BE_VLG("BE-VLG", BEL),
+    // BE_WAL("BE-WAL", BEL),
 
     // Canada
     CA_AB("CA-AB", CAN),
@@ -50,9 +50,10 @@ public enum State {
     // GB_SCT("GB-SCT", GBR),
 
     // Netherlands
-    NL_BQ1("NL-BQ1", NLD),
-    NL_BQ2("NL-BQ2", NLD),
-    NL_BQ3("NL-BQ3", NLD),
+    // TODO same problem here
+    // NL_BQ1("NL-BQ1", NLD),
+    // NL_BQ2("NL-BQ2", NLD),
+    // NL_BQ3("NL-BQ3", NLD),
 
     // United States
     US_AL("US-AL", USA),

core/src/test/java/com/graphhopper/routing/util/AreaIndexTest.java

@@ -140,6 +140,8 @@ public void testCountries() {
         assertEquals("US-NM", countryIndex.query(35.67514, -105.94665).get(0).getProperties().get(State.ISO_3166_2));
         assertEquals("AT", countryIndex.query(48.20448, 16.10788).get(0).getProperties().get(State.ISO_3166_2));
         assertEquals("GB", countryIndex.query(51.6730876, 0.0041691).get(0).getProperties().get(State.ISO_3166_2));
+        assertEquals("BE", countryIndex.query(50.846931, 4.332262).get(0).getProperties().get(State.ISO_3166_2));
+        assertEquals("NL", countryIndex.query(52.208451, 5.500524).get(0).getProperties().get(State.ISO_3166_2));
     }
 
     private AreaIndex<CustomArea> createCountryIndex() {