Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
===================================================================
--- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java	(revision 33761)
+++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java	(revision 33762)
@@ -11,6 +11,6 @@
 import java.awt.event.MouseEvent;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
@@ -140,7 +140,7 @@
         tileSource = new OsmTileSource.Mapnik();
         tileController = new TileController(tileSource, tileCache, this);
-        mapMarkerList = Collections.synchronizedList(new LinkedList<MapMarker>());
-        mapPolygonList = Collections.synchronizedList(new LinkedList<MapPolygon>());
-        mapRectangleList = Collections.synchronizedList(new LinkedList<MapRectangle>());
+        mapMarkerList = Collections.synchronizedList(new ArrayList<MapMarker>());
+        mapPolygonList = Collections.synchronizedList(new ArrayList<MapPolygon>());
+        mapRectangleList = Collections.synchronizedList(new ArrayList<MapRectangle>());
         mapMarkersVisible = true;
         mapRectanglesVisible = true;
@@ -770,5 +770,5 @@
         List<? extends ICoordinate> coords = polygon.getPoints();
         if (coords != null && coords.size() >= 3) {
-            List<Point> points = new LinkedList<>();
+            List<Point> points = new ArrayList<>();
             for (ICoordinate c : coords) {
                 Point p = getMapPosition(c, false);
@@ -782,5 +782,5 @@
                 int tilesize = tileSource.getTileSize();
                 int mapSize = tilesize << zoom;
-                List<Point> pointsWrapped = new LinkedList<>(points);
+                List<Point> pointsWrapped = new ArrayList<>(points);
                 boolean keepWrapping = true;
                 while (keepWrapping) {
@@ -793,5 +793,5 @@
                     polygon.paint(g, pointsWrapped);
                 }
-                pointsWrapped = new LinkedList<>(points);
+                pointsWrapped = new ArrayList<>(points);
                 keepWrapping = true;
                 while (keepWrapping) {