better resolving of aliases in winzone data

MenoData · Mar 17, 2018 · 97d0db0 · 97d0db0
1 parent 4537e9f
commit 97d0db0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.time4j</groupId>
     <artifactId>time4j-tool</artifactId>
-    <version>2.1</version>
+    <version>2.2</version>
     <packaging>jar</packaging>
     <name>Time4J-Tool</name>
 
@@ -196,13 +196,13 @@
         <dependency>
             <groupId>net.time4j</groupId>
             <artifactId>time4j-core</artifactId>
-            <version>3.39</version>
+            <version>3.41</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.time4j</groupId>
             <artifactId>time4j-olson</artifactId>
-            <version>3.39</version>
+            <version>3.41</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/net/time4j/tool/WinZoneCompiler.java b/src/main/java/net/time4j/tool/WinZoneCompiler.java
@@ -1,6 +1,6 @@
 /*
  * -----------------------------------------------------------------------
- * Copyright © 2013-2015 Meno Hochschild, <http://www.menodata.de/>
+ * Copyright © 2013-2018 Meno Hochschild, <http://www.menodata.de/>
  * -----------------------------------------------------------------------
  * This file (WinZoneCompiler.java) is part of project Time4J.
  *
@@ -21,6 +21,8 @@
 
 package net.time4j.tool;
 
+import net.time4j.tz.Timezone;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -262,7 +264,7 @@ private static void fill(
 
         for (String tzid : id.split(" ")) {
             // assumption: no ambivalent mapping from ids to names
-            data.put("WINDOWS~" + tzid, name);
+            data.put("WINDOWS~" + Timezone.normalize(tzid).canonical(), name);
         }
 
     }