Changeset 2308 in josm for trunk/src/org/openstreetmap/josm/data
- Timestamp:
- 2009-10-25T12:05:31+01:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/osm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/Relation.java
r2305 r2308 2 2 3 3 import java.util.ArrayList; 4 import java.util.Collection; 4 5 import java.util.HashMap; 5 6 import java.util.HashSet; … … 170 171 for (RelationMemberData member:relationData.getMembers()) { 171 172 switch (member.getMemberType()) { 172 case NODE:173 nodes.put(member.getMemberId(), nodeMarker);174 break;175 case WAY:176 ways.put(member.getMemberId(), wayMarker);177 break;178 case RELATION:179 relations.put(member.getMemberId(), relationMarker);180 break;173 case NODE: 174 nodes.put(member.getMemberId(), nodeMarker); 175 break; 176 case WAY: 177 ways.put(member.getMemberId(), wayMarker); 178 break; 179 case RELATION: 180 relations.put(member.getMemberId(), relationMarker); 181 break; 181 182 } 182 183 } … … 202 203 OsmPrimitive foundMember = null; 203 204 switch (member.getMemberType()) { 204 case NODE: 205 foundMember = nodes.get(member.getMemberId()); 206 if (foundMember == nodeMarker) { 207 throw new AssertionError("Data consistency problem - relation with missing member detected"); 208 } 209 break; 210 case WAY: 211 foundMember = ways.get(member.getMemberId()); 212 if (foundMember == wayMarker) { 213 throw new AssertionError("Data consistency problem - relation with missing member detected"); 214 } 215 break; 216 case RELATION: 217 foundMember = relations.get(member.getMemberId()); 218 if (foundMember == relationMarker) { 219 throw new AssertionError("Data consistency problem - relation with missing member detected"); 220 } 221 break; 205 case NODE: 206 foundMember = nodes.get(member.getMemberId()); 207 if (foundMember == nodeMarker) 208 throw new AssertionError("Data consistency problem - relation with missing member detected"); 209 break; 210 case WAY: 211 foundMember = ways.get(member.getMemberId()); 212 if (foundMember == wayMarker) 213 throw new AssertionError("Data consistency problem - relation with missing member detected"); 214 break; 215 case RELATION: 216 foundMember = relations.get(member.getMemberId()); 217 if (foundMember == relationMarker) 218 throw new AssertionError("Data consistency problem - relation with missing member detected"); 219 break; 222 220 } 223 221 newMembers.add(new RelationMember(member.getRole(), foundMember)); … … 290 288 } 291 289 290 /** 291 * removes all members with member.member == primitive 292 * 293 * @param primitives the primitives to check for 294 */ 295 public void removeMembersFor(Collection<OsmPrimitive> primitives) { 296 if (primitives == null || primitives.isEmpty()) 297 return; 298 299 ArrayList<RelationMember> todelete = new ArrayList<RelationMember>(); 300 for (RelationMember member: members) { 301 if (primitives.contains(member.getMember())) { 302 todelete.add(member); 303 } 304 } 305 members.removeAll(todelete); 306 } 307 292 308 @Override 293 309 public String getDisplayName(NameFormatter formatter) { -
trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java
r2282 r2308 1370 1370 leftHandTraffic = Main.pref.getBoolean("mappaint.lefthandtraffic",false); 1371 1371 orderFont = new Font(Main.pref.get("mappaint.font","Helvetica"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8)); 1372 String[] names = {"name:"+LanguageInfo.get LanguageCode(), "name", "int_name", "ref", "operator", "brand","addr:housenumber"};1372 String[] names = {"name:"+LanguageInfo.getJOSMLocaleCode(), "name", "int_name", "ref", "operator", "brand","addr:housenumber"}; 1373 1373 regionalNameOrder = Main.pref.getCollection("mappaint.nameOrder", Arrays.asList(names)); 1374 1374 minEN = nc.getEastNorth(0,nc.getHeight()-1);
Note:
See TracChangeset
for help on using the changeset viewer.