Skip to content

Commit 7571618

Browse files
rijnbrijnb
committed
Fixed formatting
1 parent abb0650 commit 7571618

File tree

5 files changed

+73
-78
lines changed

5 files changed

+73
-78
lines changed

‎src/main/java/com/mapcode/CheckArgs.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,4 @@ static void checkNonnull(@Nonnull final String param, @Nullable final Object obj
3939
throw new IllegalArgumentException("Parameter " + param + " should not be null");
4040
}
4141
}
42-
4342
}

‎src/main/java/com/mapcode/Encoder.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@ private static String encodeStarpipe(final Point pointToEncode, final Data mapco
356356
// of pipes
357357
}
358358
storageStart += product;
359-
360359
}
361360
}
362361
}

‎src/main/java/com/mapcode/SubArea.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ class SubArea {
103103
areaList.add(subArea);
104104
}
105105
}
106-
107106
}
108107
LOG.debug("SubArea (init): lat=[{}, {}], lon=[{}, {}]",
109108
Point.microDegToDeg(latMap.firstKey()), Point.microDegToDeg(latMap.lastKey()),
@@ -340,5 +339,4 @@ private void minMaxSetup(final int arg) {
340339
private static Range<Integer> trimRange(final Range<Integer> range) {
341340
return new Range<Integer>(range.getMin(), range.getMax() - 1);
342341
}
343-
344342
}

‎src/main/java/com/mapcode/Territory.java‎

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -355,15 +355,15 @@ public enum Territory {
355355
IN_MH(304, "Maharashtra", ParentTerritory.IND),
356356
IN_UP(305, "Uttar Pradesh", ParentTerritory.IND),
357357
IN_PY(306, "Puducherry", ParentTerritory.IND),
358-
AU_NSW(307, "New South Wales", ParentTerritory.AUS),
359-
AU_ACT(308, "Australian Capital Territory", ParentTerritory.AUS),
360-
AU_JBT(309, "Jervis Bay Territory", ParentTerritory.AUS, new String[]{"AU-JB"}),
358+
AU_NSW(307, "New South Wales", ParentTerritory.AUS),
359+
AU_ACT(308, "Australian Capital Territory", ParentTerritory.AUS),
360+
AU_JBT(309, "Jervis Bay Territory", ParentTerritory.AUS, new String[]{"AU-JB"}),
361361
AU_NT(310, "Northern Territory", ParentTerritory.AUS),
362362
AU_SA(311, "South Australia", ParentTerritory.AUS),
363-
AU_TAS(312, "Tasmania", ParentTerritory.AUS, new String[]{"AU-TS"}),
364-
AU_VIC(313, "Victoria", ParentTerritory.AUS),
363+
AU_TAS(312, "Tasmania", ParentTerritory.AUS, new String[]{"AU-TS"}),
364+
AU_VIC(313, "Victoria", ParentTerritory.AUS),
365365
AU_WA(314, "Western Australia", ParentTerritory.AUS),
366-
AU_QLD(315, "Queensland", ParentTerritory.AUS, new String[]{"AU-QL"}),
366+
AU_QLD(315, "Queensland", ParentTerritory.AUS, new String[]{"AU-QL"}),
367367
BR_DF(316, "Distrito Federal", ParentTerritory.BRA),
368368
BR_SE(317, "Sergipe", ParentTerritory.BRA),
369369
BR_AL(318, "Alagoas", ParentTerritory.BRA),
@@ -455,88 +455,88 @@ public enum Territory {
455455
CA_YT(404, "Yukon", ParentTerritory.CAN),
456456
CA_NT(405, "Northwest Territories", ParentTerritory.CAN),
457457
CA_NU(406, "Nunavut", ParentTerritory.CAN),
458-
RU_MOW(412, "Moscow", ParentTerritory.RUS),
459-
RU_SPE(413, "Saint Petersburg", ParentTerritory.RUS),
460-
RU_KGD(414, "Kaliningrad Oblast", ParentTerritory.RUS),
458+
RU_MOW(412, "Moscow", ParentTerritory.RUS),
459+
RU_SPE(413, "Saint Petersburg", ParentTerritory.RUS),
460+
RU_KGD(414, "Kaliningrad Oblast", ParentTerritory.RUS),
461461
RU_IN(415, "Ingushetia Republic", ParentTerritory.RUS),
462462
RU_AD(416, "Adygea Republic", ParentTerritory.RUS),
463463
RU_SE(417, "North Ossetia-Alania Republic", ParentTerritory.RUS),
464464
RU_KB(418, "Kabardino-Balkar Republic", ParentTerritory.RUS),
465465
RU_KC(419, "Karachay-Cherkess Republic", ParentTerritory.RUS),
466466
RU_CE(420, "Chechen Republic", ParentTerritory.RUS),
467467
RU_CU(421, "Chuvash Republic", ParentTerritory.RUS),
468-
RU_IVA(422, "Ivanovo Oblast", ParentTerritory.RUS),
469-
RU_LIP(423, "Lipetsk Oblast", ParentTerritory.RUS),
470-
RU_ORL(424, "Oryol Oblast", ParentTerritory.RUS),
471-
RU_TUL(425, "Tula Oblast", ParentTerritory.RUS),
468+
RU_IVA(422, "Ivanovo Oblast", ParentTerritory.RUS),
469+
RU_LIP(423, "Lipetsk Oblast", ParentTerritory.RUS),
470+
RU_ORL(424, "Oryol Oblast", ParentTerritory.RUS),
471+
RU_TUL(425, "Tula Oblast", ParentTerritory.RUS),
472472
RU_BE(426, "Belgorod Oblast", ParentTerritory.RUS, new String[]{"RU-BEL"}),
473-
RU_VLA(427, "Vladimir Oblast", ParentTerritory.RUS),
474-
RU_KRS(428, "Kursk Oblast", ParentTerritory.RUS),
475-
RU_KLU(429, "Kaluga Oblast", ParentTerritory.RUS),
473+
RU_VLA(427, "Vladimir Oblast", ParentTerritory.RUS),
474+
RU_KRS(428, "Kursk Oblast", ParentTerritory.RUS),
475+
RU_KLU(429, "Kaluga Oblast", ParentTerritory.RUS),
476476
RU_TT(430, "Tambov Oblast", ParentTerritory.RUS, new String[]{"RU-TAM"}),
477-
RU_BRY(431, "Bryansk Oblast", ParentTerritory.RUS),
478-
RU_YAR(432, "Yaroslavl Oblast", ParentTerritory.RUS),
479-
RU_RYA(433, "Ryazan Oblast", ParentTerritory.RUS),
480-
RU_AST(434, "Astrakhan Oblast", ParentTerritory.RUS),
481-
RU_MOS(435, "Moscow Oblast", ParentTerritory.RUS),
482-
RU_SMO(436, "Smolensk Oblast", ParentTerritory.RUS),
477+
RU_BRY(431, "Bryansk Oblast", ParentTerritory.RUS),
478+
RU_YAR(432, "Yaroslavl Oblast", ParentTerritory.RUS),
479+
RU_RYA(433, "Ryazan Oblast", ParentTerritory.RUS),
480+
RU_AST(434, "Astrakhan Oblast", ParentTerritory.RUS),
481+
RU_MOS(435, "Moscow Oblast", ParentTerritory.RUS),
482+
RU_SMO(436, "Smolensk Oblast", ParentTerritory.RUS),
483483
RU_DA(437, "Dagestan Republic", ParentTerritory.RUS),
484-
RU_VOR(438, "Voronezh Oblast", ParentTerritory.RUS),
485-
RU_NGR(439, "Novgorod Oblast", ParentTerritory.RUS),
486-
RU_PSK(440, "Pskov Oblast", ParentTerritory.RUS),
487-
RU_KOS(441, "Kostroma Oblast", ParentTerritory.RUS),
488-
RU_STA(442, "Stavropol Krai", ParentTerritory.RUS),
489-
RU_KDA(443, "Krasnodar Krai", ParentTerritory.RUS),
484+
RU_VOR(438, "Voronezh Oblast", ParentTerritory.RUS),
485+
RU_NGR(439, "Novgorod Oblast", ParentTerritory.RUS),
486+
RU_PSK(440, "Pskov Oblast", ParentTerritory.RUS),
487+
RU_KOS(441, "Kostroma Oblast", ParentTerritory.RUS),
488+
RU_STA(442, "Stavropol Krai", ParentTerritory.RUS),
489+
RU_KDA(443, "Krasnodar Krai", ParentTerritory.RUS),
490490
RU_KL(444, "Kalmykia Republic", ParentTerritory.RUS),
491-
RU_TVE(445, "Tver Oblast", ParentTerritory.RUS),
492-
RU_LEN(446, "Leningrad Oblast", ParentTerritory.RUS),
493-
RU_ROS(447, "Rostov Oblast", ParentTerritory.RUS),
494-
RU_VGG(448, "Volgograd Oblast", ParentTerritory.RUS),
495-
RU_VLG(449, "Vologda Oblast", ParentTerritory.RUS),
496-
RU_MUR(450, "Murmansk Oblast", ParentTerritory.RUS),
491+
RU_TVE(445, "Tver Oblast", ParentTerritory.RUS),
492+
RU_LEN(446, "Leningrad Oblast", ParentTerritory.RUS),
493+
RU_ROS(447, "Rostov Oblast", ParentTerritory.RUS),
494+
RU_VGG(448, "Volgograd Oblast", ParentTerritory.RUS),
495+
RU_VLG(449, "Vologda Oblast", ParentTerritory.RUS),
496+
RU_MUR(450, "Murmansk Oblast", ParentTerritory.RUS),
497497
RU_KR(451, "Karelia Republic", ParentTerritory.RUS),
498-
RU_NEN(452, "Nenets Autonomous Okrug", ParentTerritory.RUS),
498+
RU_NEN(452, "Nenets Autonomous Okrug", ParentTerritory.RUS),
499499
RU_KO(453, "Komi Republic", ParentTerritory.RUS),
500-
RU_ARK(454, "Arkhangelsk Oblast", ParentTerritory.RUS),
500+
RU_ARK(454, "Arkhangelsk Oblast", ParentTerritory.RUS),
501501
RU_MO(455, "Mordovia Republic", ParentTerritory.RUS),
502-
RU_NIZ(456, "Nizhny Novgorod Oblast", ParentTerritory.RUS),
503-
RU_PNZ(457, "Penza Oblast", ParentTerritory.RUS),
502+
RU_NIZ(456, "Nizhny Novgorod Oblast", ParentTerritory.RUS),
503+
RU_PNZ(457, "Penza Oblast", ParentTerritory.RUS),
504504
RU_KI(458, "Kirov Oblast", ParentTerritory.RUS, new String[]{"RU-KIR"}),
505505
RU_ME(459, "Mari El Republic", ParentTerritory.RUS),
506-
RU_ORE(460, "Orenburg Oblast", ParentTerritory.RUS),
507-
RU_ULY(461, "Ulyanovsk Oblast", ParentTerritory.RUS),
506+
RU_ORE(460, "Orenburg Oblast", ParentTerritory.RUS),
507+
RU_ULY(461, "Ulyanovsk Oblast", ParentTerritory.RUS),
508508
RU_PM(462, "Perm Krai", ParentTerritory.RUS, new String[]{"RU-PER"}),
509509
RU_BA(463, "Bashkortostan Republic", ParentTerritory.RUS),
510510
RU_UD(464, "Udmurt Republic", ParentTerritory.RUS),
511511
RU_TA(465, "Tatarstan Republic", ParentTerritory.RUS),
512-
RU_SAM(466, "Samara Oblast", ParentTerritory.RUS),
513-
RU_SAR(467, "Saratov Oblast", ParentTerritory.RUS),
514-
RU_YAN(468, "Yamalo-Nenets", ParentTerritory.RUS),
512+
RU_SAM(466, "Samara Oblast", ParentTerritory.RUS),
513+
RU_SAR(467, "Saratov Oblast", ParentTerritory.RUS),
514+
RU_YAN(468, "Yamalo-Nenets", ParentTerritory.RUS),
515515
RU_KM(469, "Khanty-Mansi", ParentTerritory.RUS, new String[]{"RU-KHM"}),
516-
RU_SVE(470, "Sverdlovsk Oblast", ParentTerritory.RUS),
517-
RU_TYU(471, "Tyumen Oblast", ParentTerritory.RUS),
518-
RU_KGN(472, "Kurgan Oblast", ParentTerritory.RUS),
516+
RU_SVE(470, "Sverdlovsk Oblast", ParentTerritory.RUS),
517+
RU_TYU(471, "Tyumen Oblast", ParentTerritory.RUS),
518+
RU_KGN(472, "Kurgan Oblast", ParentTerritory.RUS),
519519
RU_CH(473, "Chelyabinsk Oblast", ParentTerritory.RUS, new String[]{"RU-CHE"}),
520520
RU_BU(474, "Buryatia Republic", ParentTerritory.RUS),
521-
RU_ZAB(475, "Zabaykalsky Krai", ParentTerritory.RUS),
522-
RU_IRK(476, "Irkutsk Oblast", ParentTerritory.RUS),
523-
RU_NVS(477, "Novosibirsk Oblast", ParentTerritory.RUS),
524-
RU_TOM(478, "Tomsk Oblast", ParentTerritory.RUS),
525-
RU_OMS(479, "Omsk Oblast", ParentTerritory.RUS),
521+
RU_ZAB(475, "Zabaykalsky Krai", ParentTerritory.RUS),
522+
RU_IRK(476, "Irkutsk Oblast", ParentTerritory.RUS),
523+
RU_NVS(477, "Novosibirsk Oblast", ParentTerritory.RUS),
524+
RU_TOM(478, "Tomsk Oblast", ParentTerritory.RUS),
525+
RU_OMS(479, "Omsk Oblast", ParentTerritory.RUS),
526526
RU_KK(480, "Khakassia Republic", ParentTerritory.RUS),
527-
RU_KEM(481, "Kemerovo Oblast", ParentTerritory.RUS),
527+
RU_KEM(481, "Kemerovo Oblast", ParentTerritory.RUS),
528528
RU_AL(482, "Altai Republic", ParentTerritory.RUS),
529-
RU_ALT(483, "Altai Krai", ParentTerritory.RUS),
529+
RU_ALT(483, "Altai Krai", ParentTerritory.RUS),
530530
RU_TY(484, "Tuva Republic", ParentTerritory.RUS),
531-
RU_KYA(485, "Krasnoyarsk Krai", ParentTerritory.RUS),
532-
RU_MAG(486, "Magadan Oblast", ParentTerritory.RUS),
533-
RU_CHU(487, "Chukotka Okrug", ParentTerritory.RUS),
534-
RU_KAM(488, "Kamchatka Krai", ParentTerritory.RUS),
535-
RU_SAK(489, "Sakhalin Oblast", ParentTerritory.RUS),
531+
RU_KYA(485, "Krasnoyarsk Krai", ParentTerritory.RUS),
532+
RU_MAG(486, "Magadan Oblast", ParentTerritory.RUS),
533+
RU_CHU(487, "Chukotka Okrug", ParentTerritory.RUS),
534+
RU_KAM(488, "Kamchatka Krai", ParentTerritory.RUS),
535+
RU_SAK(489, "Sakhalin Oblast", ParentTerritory.RUS),
536536
RU_PO(490, "Primorsky Krai", ParentTerritory.RUS, new String[]{"RU-PRI"}),
537-
RU_YEV(491, "Jewish Autonomous Oblast", ParentTerritory.RUS),
538-
RU_KHA(492, "Khabarovsk Krai", ParentTerritory.RUS),
539-
RU_AMU(493, "Amur Oblast", ParentTerritory.RUS),
537+
RU_YEV(491, "Jewish Autonomous Oblast", ParentTerritory.RUS),
538+
RU_KHA(492, "Khabarovsk Krai", ParentTerritory.RUS),
539+
RU_AMU(493, "Amur Oblast", ParentTerritory.RUS),
540540
RU_SA(494, "Sakha Republic", ParentTerritory.RUS, null, new String[]{"Yakutia Republic"}),
541541
CN_SH(497, "Shanghai", ParentTerritory.CHN, new String[]{"CN-31"}),
542542
CN_TJ(498, "Tianjin", ParentTerritory.CHN, new String[]{"CN-12"}),
@@ -569,18 +569,18 @@ public enum Territory {
569569
CN_GS(525, "Gansu", ParentTerritory.CHN, new String[]{"CN-62"}),
570570
CN_QH(526, "Qinghai", ParentTerritory.CHN, new String[]{"CN-63"}),
571571
CN_XJ(527, "Xinjiang Uyghur", ParentTerritory.CHN, new String[]{"CN-65"}),
572-
UMI(529, "United States Minor Outlying Islands", null, new String[]{"US-UM", "USA-UM", "JTN"}),
573-
CPT(530, "Clipperton Island"),
574-
AT0(531, "Macquarie Island", ParentTerritory.ATA),
575-
AT1(532, "Ross Dependency", ParentTerritory.ATA),
576-
AT2(533, "Adelie Land", ParentTerritory.ATA),
577-
AT3(534, "Australian Antarctic Territory", ParentTerritory.ATA),
578-
AT4(535, "Queen Maud Land", ParentTerritory.ATA),
579-
AT5(536, "British Antarctic Territory", ParentTerritory.ATA),
580-
AT6(537, "Chile Antartica", ParentTerritory.ATA),
581-
AT7(538, "Argentine Antarctica", ParentTerritory.ATA),
582-
AT8(539, "Peter 1 Island", ParentTerritory.ATA),
583-
AAA(541, "International", null, null, new String[]{"Worldwide", "Earth"});
572+
UMI(529, "United States Minor Outlying Islands", null, new String[]{"US-UM", "USA-UM", "JTN"}),
573+
CPT(530, "Clipperton Island"),
574+
AT0(531, "Macquarie Island", ParentTerritory.ATA),
575+
AT1(532, "Ross Dependency", ParentTerritory.ATA),
576+
AT2(533, "Adelie Land", ParentTerritory.ATA),
577+
AT3(534, "Australian Antarctic Territory", ParentTerritory.ATA),
578+
AT4(535, "Queen Maud Land", ParentTerritory.ATA),
579+
AT5(536, "British Antarctic Territory", ParentTerritory.ATA),
580+
AT6(537, "Chile Antartica", ParentTerritory.ATA),
581+
AT7(538, "Argentine Antarctica", ParentTerritory.ATA),
582+
AT8(539, "Peter 1 Island", ParentTerritory.ATA),
583+
AAA(541, "International", null, null, new String[]{"Worldwide", "Earth"});
584584

585585
private final int territoryCode;
586586
@Nonnull private final String fullName;

‎src/test/java/com/mapcode/ReferenceFileTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ private void checkFile(@Nonnull final String baseFileName) throws Exception {
186186
LOG.error("checkFile: Mapcode '{}' at {} is not in the reference file!",
187187
result, reference.point);
188188
++error;
189-
190189
}
191190
}
192191

0 commit comments

Comments
 (0)