Projects >> mkgmap >>33197de95c18a60a6475e8e6e05d10ca96d26d8a

Chunk
Conflicting content
		Sort sort = getConfig().getSort();
		List> sortedStreets = new ArrayList<>(allStreets.size());
		for (Mdr7Record m : allStreets) {
<<<<<<< HEAD
			String nameForKey = m.getPartialName() + m.getInitialPart();
			sortedStreets.add(sort.createSortKey(m, nameForKey, m.getMapIndex()));
=======
			sortedStreets.add(new MultiSortKey<>(
					sort.createSortKey(m, m.getPartialName()),
					sort.createSortKey(m, m.getInitialPart(), m.getMapIndex()),
					null));
>>>>>>> 1cc06d740f3d28225ac797b2f9a10c58b682fd16
		}
		Collections.sort(sortedStreets);
Solution content
		Sort sort = getConfig().getSort();
		List> sortedStreets = new ArrayList<>(allStreets.size());
		for (Mdr7Record m : allStreets) {
			sortedStreets.add(new MultiSortKey<>(
					sort.createSortKey(m, m.getPartialName()),
					sort.createSortKey(m, m.getInitialPart(), m.getMapIndex()),
					null));
		}
		Collections.sort(sortedStreets);
File
Mdr7.java
Developer's decision
Version 2
Kind of conflict
Other