Index: resources/LocatorConfig.xml
===================================================================
--- resources/LocatorConfig.xml (revision 3354)
+++ resources/LocatorConfig.xml (working copy)
@@ -33,7 +33,7 @@
AO
AGO
-
+
AI
AIA
@@ -41,7 +41,7 @@
AQ
ATA
-
+
AG
ATG
@@ -57,7 +57,7 @@
AW
ABW
-
+
AU
AUS
@@ -74,7 +74,7 @@
AZE
Azərbaycan
-
+
BS
BHS
The Bahamas
@@ -84,12 +84,12 @@
BHR
الإسلامية
-
+
BD
BGD
বাংলাদেশ
-
+
BB
BRB
@@ -117,11 +117,11 @@
BJ
BEN
-
+
BM
BMU
-
+
BT
BTN
@@ -139,7 +139,7 @@
BIH
Bosnia and Herzegovina
-
+
BW
BWA
@@ -155,7 +155,7 @@
IO
IOT
-
+
BN
BRN
برني دارالسلام
@@ -193,7 +193,7 @@
CPV
Cabo Verde
-
+
KY
CYM
@@ -216,11 +216,11 @@
CHN
People's Republic of China
-
+
CX
CXR
-
+
CC
CCK
@@ -244,7 +244,7 @@
COD
Congo-Kinshasa
-
+
CK
COK
@@ -269,7 +269,7 @@
CW
CUW
-
+
CY
CYP
Κυπριακή Δημοκρατία
@@ -289,7 +289,7 @@
DJ
DJI
-
+
DM
DMA
@@ -330,7 +330,7 @@
ET
ETH
-
+
FK
FLK
@@ -339,7 +339,7 @@
FRO
Føroyar
-
+
FJ
FJI
VITI
@@ -406,7 +406,7 @@
GL
GRL
-
+
GD
GRD
@@ -423,7 +423,7 @@
GT
GTM
-
+
GG
GGY
@@ -436,7 +436,7 @@
GNB
Guiné-Bissau
-
+
GY
GUY
@@ -460,7 +460,7 @@
HN
HND
-
+
HK
HKG
@@ -476,11 +476,11 @@
ICE
ISL
-
+
IN
IND
-
+
ID
IDN
@@ -495,13 +495,13 @@
IRQ
جمهورية العراق
-
+
Republic of Ireland
Éire
IE
IRL
-
+
IM
IMN
@@ -515,16 +515,16 @@
IT
ITA
-
+
JM
JAM
-
+
JP
JPN
日本
-
+
JE
JEY
@@ -537,11 +537,11 @@
KAZ
Казахстан
-
+
KE
KEN
-
+
KI
KIR
@@ -581,7 +581,7 @@
LBN
الجمهورية اللبنانية
-
+
LS
LSO
Kingdom of Lesotho
@@ -612,7 +612,7 @@
Groussherzogtum Lëtzebuerg
Grand Duchy of Luxembourg
-
+
MO
MAC
@@ -627,16 +627,16 @@
MDG
Madagasikara
-
+
MW
MWI
Republic of Malawi
-
+
MY
MYS
-
+
MV
MDV
ދިވެހިރާއްޖޭގެ ޖުމުހޫރިއްޔާ
@@ -645,7 +645,7 @@
ML
MLI
-
+
MT
MLT
@@ -662,7 +662,7 @@
MR
MRT
-
+
MU
MUS
@@ -698,7 +698,7 @@
ME
MNE
-
+
MS
MSR
@@ -706,7 +706,7 @@
MA
MAR
-
+
MZ
MOZ
Moçambique
@@ -715,16 +715,16 @@
MM
MMR
-
+
NA
NAM
-
+
NR
NRU
NAOERO
-
+
NP
NPL
नेपाल
@@ -739,7 +739,7 @@
NC
NCL
-
+
NZ
NZL
AOTEAROA NEW ZEALAND
@@ -756,11 +756,11 @@
NG
NGA
-
+
NU
NIU
-
+
NF
NFK
@@ -780,7 +780,7 @@
OMN
سلطنة عمان
-
+
PK
PAK
پاکستان
@@ -800,7 +800,7 @@
PAN
Panamá
-
+
PG
PNG
PAPUA NIUGINI
@@ -817,7 +817,7 @@
PH
PHL
-
+
PN
PCN
@@ -866,19 +866,19 @@
BLM
Saint-Barthélémy
-
+
Ascension
Tristan da Cunha
SH
SHN
-
+
Saint Kitts
Nevis
KN
KNA
-
+
LC
LCA
@@ -892,13 +892,13 @@
PM
SPM
-
+
Saint Vincent
Grenadines
VC
VCT
-
+
WS
WSM
@@ -928,7 +928,7 @@
Serbia
Republic of Serbia
-
+
SC
SYC
SESEL
@@ -937,7 +937,7 @@
SL
SLE
-
+
SG
SGP
SINGAPURA
@@ -956,7 +956,7 @@
SVN
Slovenia
-
+
SB
SLB
@@ -965,7 +965,7 @@
SOM
Soomaaliya
-
+
ZA
ZAF
@@ -980,7 +980,7 @@
ES
ESP
-
+
LK
LKA
ශ්රී ලංකා
@@ -995,7 +995,7 @@
SDN
جمهورية السودان
-
+
SR
SUR
@@ -1005,7 +1005,7 @@
SJ
SJM
-
+
SZ
SWZ
Swatini
@@ -1037,17 +1037,17 @@
TJK
Тоҷикистон
-
+
United Republic of Tanzania
TZ
TZA
-
+
TH
THA
ราชอาณาจักรไทย
-
+
TL
TLS
Timór Loro Sa'e
@@ -1058,7 +1058,7 @@
TGO
République Togolaise
-
+
TK
TKL
@@ -1066,7 +1066,7 @@
TO
TON
-
+
Trinidad
Tobago
TT
@@ -1086,15 +1086,15 @@
TKM
Türkmenistan
-
+
TC
TCA
-
+
TV
TUV
-
+
UG
UGA
@@ -1109,7 +1109,7 @@
ARE
الإمارات العربيّة المتّحدة
-
+
England
Scotland
Wales
@@ -1153,12 +1153,12 @@
VNM
Việt Nam
-
+
VG
VGB
British Virgin Islands
-
+
VI
VIR
@@ -1177,11 +1177,11 @@
YEM
اليمن
-
+
ZM
ZMB
-
+
ZW
ZWE
Index: src/uk/me/parabola/mkgmap/build/LocatorConfig.java
===================================================================
--- src/uk/me/parabola/mkgmap/build/LocatorConfig.java (revision 3354)
+++ src/uk/me/parabola/mkgmap/build/LocatorConfig.java (working copy)
@@ -35,13 +35,15 @@
private static final Logger log = Logger.getLogger(LocatorConfig.class);
/** maps country name (in all variants) to the 3 letter ISO code */
- private final Map isoMap = new HashMap();
+ private final Map isoMap = new HashMap<>();
/** maps the ISO code to the offset of the region in the is_in tag */
- private final Map regOffsetMap = new HashMap();
+ private final Map regOffsetMap = new HashMap<>();
/** maps the ISO code to the POI display flag */
- private final Map poiDispFlagMap = new HashMap();
+ private final Map poiDispFlagMap = new HashMap<>();
+ /** maps the ISO code to the drive-on-left flag */
+ private final Map driveOnLeftFlagMap = new HashMap<>();
/** contains the names of all continents */
- private final Set continents = new HashSet();
+ private final Set continents = new HashSet<>();
/** maps ISO => default country name */
private final Map defaultCountryNames = new HashMap();
@@ -153,6 +155,10 @@
if (poiDispTag != 0x0 && iso != null) {
setPoiDispTag(iso, poiDispTag);
}
+ Node driveOnLeft = attr.getNamedItem("driveOnLeft");
+ if (driveOnLeft != null && "true".equals(driveOnLeft.getNodeValue())){
+ driveOnLeftFlagMap.put(iso, true);
+ }
}
if (iso != null) {
@@ -339,5 +345,14 @@
String s = continent.toUpperCase().trim();
return continents.contains(s);
}
+
+ public synchronized boolean getDriveOnLeftFlag(String iso)
+ {
+ if (iso == null)
+ return false;
+ if (driveOnLeftFlagMap.containsKey(iso))
+ return true;
+ return false;
+ }
}
Index: src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java
===================================================================
--- src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java (revision 3354)
+++ src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java (working copy)
@@ -42,6 +42,7 @@
import uk.me.parabola.imgfmt.app.trergn.ExtTypeAttributes;
import uk.me.parabola.imgfmt.app.trergn.MapObject;
import uk.me.parabola.log.Logger;
+import uk.me.parabola.mkgmap.build.LocatorConfig;
import uk.me.parabola.mkgmap.build.LocatorUtil;
import uk.me.parabola.mkgmap.filters.LineSizeSplitterFilter;
import uk.me.parabola.mkgmap.general.AreaClipper;
@@ -127,6 +128,10 @@
private boolean driveOnLeft;
private boolean driveOnRight;
+ private int numDriveOnLeftRoundabouts = 0;
+ private int numDriveOnRightRoundabouts = 0;
+
+
private final boolean checkRoundabouts;
private int reportDeadEnds;
private final boolean linkPOIsToWays;
@@ -161,14 +166,14 @@
housenumberGenerator = new HousenumberGenerator(props);
- driveOnLeft = props.getProperty("drive-on-left") != null;
+ driveOnLeft = props.getProperty("drive-on-left", false) ;
// check if the setDriveOnLeft flag should be ignored
// (this is the case if precompiled sea is loaded)
if (props.getProperty("ignore-drive-on-left") == null)
// do not ignore the flag => initialize it
NODHeader.setDriveOnLeft(driveOnLeft);
- driveOnRight = props.getProperty("drive-on-right") != null;
- checkRoundabouts = props.getProperty("check-roundabouts") != null;
+ driveOnRight = props.getProperty("drive-on-right", false);
+ checkRoundabouts = props.getProperty("check-roundabouts",false);
reportDeadEnds = props.getProperty("report-dead-ends", 1);
LineAdder overlayAdder = style.getOverlays(lineAdder);
@@ -332,8 +337,17 @@
cw.setReversed(wasReversed);
if (cw.isRoad()){
roads.add(cw);
- if (wasReversed && cw.isRoundabout())
- log.warn("Roundabout", way.getId(), "has reverse oneway tag (" + way.getPoints().get(0).toOSMURL() + ")");
+ if (cw.isRoundabout()) {
+ String country = way.getTag(countryTagKey);
+ if (country != null) {
+ if (LocatorConfig.get().getDriveOnLeftFlag(country))
+ numDriveOnLeftRoundabouts++;
+ else
+ numDriveOnRightRoundabouts++;
+ }
+ if (wasReversed)
+ log.warn("Roundabout", way.getId(), "has reverse oneway tag (" + way.getPoints().get(0).toOSMURL() + ")");
+ }
lastRoadId = way.getId();
}
else
@@ -504,6 +518,22 @@
}
public void end() {
+ log.info("Number of drive-on-left/drive-on-right roundabouts:",numDriveOnLeftRoundabouts,numDriveOnRightRoundabouts);
+ if (!driveOnLeft && !driveOnRight){
+ if (numDriveOnLeftRoundabouts > numDriveOnRightRoundabouts){
+ driveOnLeft = true;
+ NODHeader.setDriveOnLeft(true);
+ }
+ else if (numDriveOnLeftRoundabouts < numDriveOnRightRoundabouts){
+ driveOnRight = true;
+ }
+ } else {
+ if (driveOnLeft && numDriveOnLeftRoundabouts == 0 && numDriveOnRightRoundabouts > 0)
+ log.warn("option drive-on-left is in used but tile contains only drive-on-right roundabouts");
+ if (driveOnRight && numDriveOnRightRoundabouts == 0 && numDriveOnLeftRoundabouts > 0)
+ log.warn("option drive-on-right is in used but tile contains only drive-on-left roundabouts");
+ }
+
setHighwayCounts();
findUnconnectedRoads();
rotateClosedWaysToFirstNode();