Changeset 17671 in josm
- Timestamp:
- 2021-03-26T22:41:27+01:00 (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java
r17584 r17671 185 185 } 186 186 if (n == null) { 187 String s = node.get("addr:housename"); 188 if (s != null) { 189 /* I18n: name of house as parameter */ 190 n = tr("House {0}", s); 191 } 192 if (n == null && (s = node.get("addr:housenumber")) != null) { 193 String t = node.get("addr:street"); 194 if (t != null) { 195 /* I18n: house number, street as parameter, number should remain 196 before street for better visibility */ 197 n = tr("House number {0} at {1}", s, t); 198 } else { 199 /* I18n: house number as parameter */ 200 n = tr("House number {0}", s); 201 } 202 } 187 n = formatAddress(node); 203 188 } 204 189 … … 269 254 } 270 255 if (n == null) { 271 String s = way.get("addr:housename"); 272 if (s != null) { 273 /* I18n: name of house as parameter */ 274 n = tr("House {0}", s); 275 } 276 if (n == null && (s = way.get("addr:housenumber")) != null) { 277 String t = way.get("addr:street"); 278 if (t != null) { 279 /* I18n: house number, street as parameter, number should remain 280 before street for better visibility */ 281 n = tr("House number {0} at {1}", s, t); 282 } else { 283 /* I18n: house number as parameter */ 284 n = tr("House number {0}", s); 285 } 286 } 256 n = formatAddress(way); 287 257 } 288 258 if (n == null && way.hasKey("building")) { … … 313 283 .findFirst().orElse(result); 314 284 285 } 286 287 private static String formatAddress(Tagged osm) { 288 String n = null; 289 String s = osm.get("addr:housename"); 290 if (s != null) { 291 /* I18n: name of house as parameter */ 292 n = tr("House {0}", s); 293 } 294 if (n == null && (s = osm.get("addr:housenumber")) != null) { 295 String t = osm.get("addr:street"); 296 if (t != null) { 297 /* I18n: house number, street as parameter, number should remain 298 before street for better visibility */ 299 n = tr("House number {0} at {1}", s, t); 300 } else { 301 /* I18n: house number as parameter */ 302 n = tr("House number {0}", s); 303 } 304 } 305 return n; 315 306 } 316 307
Note:
See TracChangeset
for help on using the changeset viewer.