update for latest josm

matsim-org · May 6, 2020 · e946087 · e946087
1 parent d42eff9
commit e946087
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -55,15 +55,16 @@ dependencies {
 sourceCompatibility = 1.8
 archivesBaseName = "matsim"
 josm {
-    josmCompileVersion = 15492
+    josmCompileVersion = 16392
     manifest {
         author = "Nico Kuehnel"
         description = "Allows to edit and extract network information for the traffic simulation MATSim"
         iconPath = "images/dialogs/matsim-scenario.png"
-        minJosmVersion = 15238
+        minJosmVersion = 16392
         mainClass = "org.matsim.contrib.josm.MATSimPlugin"
         pluginDependencies << 'jts' << 'javafx' << 'geotools'
         website = new URL("http://www.matsim.org")
+        oldVersionDownloadLink 16239, 'v1.0.5', new URL('https://github.com/matsim-org/josm-matsim-plugin/releases/download/v1.0.5/matsim.jar')
         oldVersionDownloadLink 15007, 'v1.0.3', new URL('https://github.com/matsim-org/josm-matsim-plugin/releases/download/v1.0.3/matsim.jar')
         oldVersionDownloadLink 14418, 'v1.0.0', new URL('https://github.com/matsim-org/josm-matsim-plugin/releases/download/v1.0.0/matsim.jar')
         oldVersionDownloadLink 14382, 'v0.9.8', new URL('https://github.com/matsim-org/josm-matsim-plugin/releases/download/v0.9.8/matsim.jar')

diff --git a/src/main/java/org/matsim/contrib/josm/MapRenderer.java b/src/main/java/org/matsim/contrib/josm/MapRenderer.java
@@ -16,6 +16,7 @@
 import org.openstreetmap.josm.gui.mappaint.styleelement.TextLabel;
 import org.openstreetmap.josm.gui.mappaint.styleelement.placement.OnLineStrategy;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.RotationAngle;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
@@ -185,7 +186,7 @@ public String compose(IPrimitive prim) {
     static class MATSimTextLabel extends TextLabel {
 
         protected MATSimTextLabel(LabelCompositionStrategy labelCompositionStrategy, Font font, Color color, Float aFloat, Color color1) {
-            super(labelCompositionStrategy, font, color, aFloat, color1);
+            super(labelCompositionStrategy, font, RotationAngle.NO_ROTATION, color, aFloat, color1);
         }
     }