Changeset 14015 in josm
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
r13682 r14015 13 13 import java.util.Arrays; 14 14 import java.util.EnumMap; 15 import java.util.List; 15 16 import java.util.Locale; 16 17 import java.util.Map; … … 281 282 282 283 private static SearchResult searchName(String area) throws IOException { 283 return NameFinder.queryNominatim(area).stream().filter( 284 return searchName(NameFinder.queryNominatim(area)); 285 } 286 287 static SearchResult searchName(List<SearchResult> results) { 288 return results.stream().filter( 284 289 x -> !OsmPrimitiveType.NODE.equals(x.getOsmId().getType())).iterator().next(); 285 290 } … … 292 297 idOffset.put(OsmPrimitiveType.RELATION, 3_600_000_000L); 293 298 final PrimitiveId osmId = searchName(area).getOsmId(); 299 Logging.debug("Area '{0}' resolved to {1}", area, osmId); 294 300 return String.format("area(%d)", osmId.getUniqueId() + idOffset.get(osmId.getType())); 295 301 } -
trunk/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java
r13337 r14015 11 11 import static org.junit.Assert.assertTrue; 12 12 13 import java.io.StringReader; 13 14 import java.time.LocalDateTime; 14 15 import java.util.regex.Matcher; … … 217 218 "out body;")); 218 219 } 220 221 /** 222 * Unit test of {@link OverpassDownloadReader#searchName(java.util.List)} 223 * @throws Exception if an error occurs 224 */ 225 @Test 226 public void testSearchName() throws Exception { 227 try (StringReader reader = new StringReader(NameFinderTest.SAMPLE)) { 228 assertEquals(1942586L, 229 OverpassDownloadReader.searchName(NameFinder.parseSearchResults(reader)).getOsmId().getUniqueId()); 230 } 231 } 219 232 }
Note:
See TracChangeset
for help on using the changeset viewer.