From cb36cfc9839440f1c3c8568848539aa73cb7ddb7 Mon Sep 17 00:00:00 2001
From: Gustl22 <user.rebo@gmx.de>
Date: Tue, 17 Apr 2018 20:44:30 +0200
Subject: [PATCH] PathLayer Task (regular): final variables + minor refactor

---
 vtm/src/org/oscim/layers/PathLayer.java | 30 ++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/vtm/src/org/oscim/layers/PathLayer.java b/vtm/src/org/oscim/layers/PathLayer.java
index 939ef760..bea9a34e 100644
--- a/vtm/src/org/oscim/layers/PathLayer.java
+++ b/vtm/src/org/oscim/layers/PathLayer.java
@@ -244,17 +244,17 @@ public class PathLayer extends Layer implements GestureListener {
                 return;
 
             /* keep position to render relative to current state */
-            mMapPosition.copy(t.pos);
+            mMapPosition.copy(t.position);
 
             /* compile new layers */
-            buckets.set(t.bucket.get());
+            buckets.set(t.buckets.get());
             compile();
         }
     }
 
     final static class Task {
-        RenderBuckets bucket = new RenderBuckets();
-        MapPosition pos = new MapPosition();
+        final RenderBuckets buckets = new RenderBuckets();
+        final MapPosition position = new MapPosition();
     }
 
     final class Worker extends SimpleWorker<Task> {
@@ -320,8 +320,8 @@ public class PathLayer extends Layer implements GestureListener {
 
             }
             if (size == 0) {
-                if (task.bucket.get() != null) {
-                    task.bucket.clear();
+                if (task.buckets.get() != null) {
+                    task.buckets.clear();
                     mMap.render();
                 }
                 return true;
@@ -330,22 +330,22 @@ public class PathLayer extends Layer implements GestureListener {
             LineBucket ll;
 
             if (mLineStyle.stipple == 0 && mLineStyle.texture == null)
-                ll = task.bucket.getLineBucket(0);
+                ll = task.buckets.getLineBucket(0);
             else
-                ll = task.bucket.getLineTexBucket(0);
+                ll = task.buckets.getLineTexBucket(0);
 
             ll.line = mLineStyle;
 
             //ll.scale = ll.line.width;
 
-            mMap.getMapPosition(task.pos);
+            mMap.getMapPosition(task.position);
 
-            int zoomlevel = task.pos.zoomLevel;
-            task.pos.scale = 1 << zoomlevel;
+            int zoomlevel = task.position.zoomLevel;
+            task.position.scale = 1 << zoomlevel;
 
-            double mx = task.pos.x;
-            double my = task.pos.y;
-            double scale = Tile.SIZE * task.pos.scale;
+            double mx = task.position.x;
+            double my = task.position.y;
+            double scale = Tile.SIZE * task.position.scale;
 
             // flip around dateline
             int flip = 0;
@@ -437,7 +437,7 @@ public class PathLayer extends Layer implements GestureListener {
 
         @Override
         public void cleanup(Task task) {
-            task.bucket.clear();
+            task.buckets.clear();
         }
 
         private int addPoint(float[] points, int i, int x, int y) {