Fix duplicate editor source

Author: bailuk

aat-android/src/main/kotlin/ch/bailu/aat/broadcaster/AndroidDispatcherFactory.kt

@@ -8,7 +8,6 @@ import ch.bailu.aat_lib.dispatcher.usage.UsageTrackerInterface
 
 fun DispatcherInterface.addMapOverlaySources(appContext: AppContext, usageTrackers: UsageTrackerInterface) {
     this.addOverlaySources(appContext, usageTrackers)
-    this.addSource(FixedOverlaySource.createDraftSource(appContext, usageTrackers))
     this.addSource(FixedOverlaySource.createPoiSource(appContext, usageTrackers))
     this.addSource(FixedOverlaySource.createBrouterSource(appContext, usageTrackers))
     this.addSource(FixedOverlaySource.createNominatimReverseSource(appContext, usageTrackers))

aat-android/src/main/kotlin/ch/bailu/aat/map/MapFactory.kt

@@ -61,6 +61,7 @@ class MapFactory(private val m: MapsForgeViewBase, activityContext: ActivityCont
         addMapOverlays(usageTracker)
 
         m.add(EditorBarLayer(appContext, c, mc, d, iid, e))
+        m.add(GpxDynLayer(s, mc, ser, d, iid))
         m.add(GpxDynLayer(s, mc, ser, d, InfoID.FILE_VIEW))
         m.add(GpxDynLayer(s, mc, ser, d, InfoID.TRACKER))
 

aat-android/src/main/kotlin/ch/bailu/aat/map/layer/EditorBarLayer.kt

@@ -15,7 +15,6 @@ import ch.bailu.aat_lib.dispatcher.EditorSourceInterface
 import ch.bailu.aat_lib.gpx.GpxPoint
 import ch.bailu.aat_lib.map.MapContext
 import ch.bailu.aat_lib.map.edge.Position
-import ch.bailu.aat_lib.map.layer.gpx.GpxDynLayer
 import ch.bailu.aat_lib.preferences.StorageInterface
 import ch.bailu.aat_lib.resources.Res
 
@@ -34,7 +33,6 @@ class EditorBarLayer(
     private val remove: View = bar.addImageButton(R.drawable.list_remove)
     private val up: View = bar.addImageButton(R.drawable.go_up)
     private val down: View = bar.addImageButton(R.drawable.go_down)
-    private val content: GpxDynLayer = GpxDynLayer(appContext.storage, mcontext, appContext.services)
     private val selector = EditorNodeViewLayer(appContext, context, mcontext, edit)
     private val file: View = bar.addImageButton(R.drawable.edit_select_all_inverse)
     private val brouterController = BrouterController(appContext, edit)
@@ -45,7 +43,6 @@ class EditorBarLayer(
         ToolTip.set(up, Res.str().tt_edit_up())
         ToolTip.set(down, Res.str().tt_edit_down())
         dispatcher.addTarget(selector, iid)
-        dispatcher.addTarget(content, iid)
     }
 
     override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
@@ -54,14 +51,12 @@ class EditorBarLayer(
     }
 
     override fun drawInside(mcontext: MapContext) {
-        content.drawInside(mcontext)
         if (isBarVisible) {
             selector.drawInside(mcontext)
         }
     }
 
     override fun drawForeground(mcontext: MapContext) {
-        content.drawForeground(mcontext)
         if (isBarVisible) {
             selector.drawForeground(mcontext)
         }
@@ -94,7 +89,6 @@ class EditorBarLayer(
     }
 
     override fun onPreferencesChanged(storage: StorageInterface, key: String) {
-        content.onPreferencesChanged(storage, key)
         selector.onPreferencesChanged(storage, key)
     }
 

aat-lib/src/main/java/ch/bailu/aat_lib/dispatcher/source/EditorOrBackupSource.kt

@@ -55,7 +55,6 @@ class EditorOrBackupSource(appContext: AppContext, source: SourceInterface) :
         }
     }
 
-
     override val editor: EditorInterface
         get() =  editorSource.editor
 

aat-lib/src/main/java/ch/bailu/aat_lib/service/cache/gpx/ObjGpxEditable.kt

@@ -19,17 +19,16 @@ import ch.bailu.aat_lib.util.fs.FileNameSplitter
 import ch.bailu.aat_lib.util.fs.FileUtil
 import ch.bailu.foc.Foc
 
-class ObjGpxEditable(_id: String, private val _file: Foc, sc: AppContext) : ObjGpx(_id) {
+class ObjGpxEditable(id: String, private val file: Foc, sc: AppContext) : ObjGpx(id) {
     private var currentHandle = NULL
-    val editor: GpxListEditor
+    val editor: GpxListEditor = GpxListEditor(sc.broadcaster)
 
     init {
-        editor = GpxListEditor(sc.broadcaster)
         sc.services.getCacheService().addToBroadcaster(this)
     }
 
     override fun onInsert(appContext: AppContext) {
-        val handle = appContext.services.getCacheService().getObject(_file.path, ObjGpxStatic.Factory())
+        val handle = appContext.services.getCacheService().getObject(file.path, ObjGpxStatic.Factory())
         currentHandle = handle as? ObjGpx ?: NULL
         editor.loadIntoEditor(currentHandle.getGpxList())
     }
@@ -49,7 +48,7 @@ class ObjGpxEditable(_id: String, private val _file: Foc, sc: AppContext) : ObjG
 
     override fun onDownloaded(id: String, url: String, appContext: AppContext) {}
     override fun onChanged(id: String, appContext: AppContext) {
-        if (id == _file.path) {
+        if (id == file.path) {
             editor.loadIntoEditor(currentHandle.getGpxList())
         }
     }
@@ -192,7 +191,7 @@ class ObjGpxEditable(_id: String, private val _file: Foc, sc: AppContext) : ObjG
         }
 
         override fun getFile(): Foc {
-            return _file
+            return file
         }
 
         override fun getLoaded(): Boolean {

aat-lib/src/main/java/ch/bailu/aat_lib/service/editor/EditorHelper.kt

@@ -52,8 +52,9 @@ class EditorHelper(private val appContext: AppContext) :
     }
 
     override fun getInfo(): GpxInformation {
+        val handle = handle
         return if (handle is ObjGpxEditable) {
-            (handle as ObjGpxEditable).editor
+            handle.editor
         } else GpxInformation.NULL
     }
 

aat-lib/src/main/java/ch/bailu/aat_lib/service/editor/GpxEditor.java

@@ -9,7 +9,6 @@ public final class GpxEditor {
 
     private final EditorRing ring;
 
-
     public GpxEditor(GpxList list) {
         if (list.getPointList().size() > 0) {
             ring = new EditorRing((new NodeEditor((GpxPointNode) list.getPointList().getFirst(),
@@ -19,39 +18,30 @@ public GpxEditor(GpxList list) {
         }
     }
 
-
     public void select(GpxPointNode point, GpxList list) {
         ring.set(new NodeEditor(point, list));
     }
 
-
     public void clear() {
         ring.add(new NodeEditor());
     }
 
-
     public void unlinkSelectedNode() {
         ring.add(ring.get().unlink());
-
     }
 
-
     public void insertNode(GpxPointInterface point) {
         ring.add(ring.get().insert(point));
-
     }
 
-
     public void moveSelectedUp() {
         GpxPointInterface point = ring.get().getPoint();
 
         ring.add(ring.get().unlink());
         ring.set(ring.get().previous());
         ring.set(ring.get().insert(point));
-
     }
 
-
     public void moveSelectedDown() {
         GpxPointInterface point = ring.get().getPoint();
 
@@ -61,32 +51,26 @@ public void moveSelectedDown() {
 
     }
 
-
     public GpxList getList() {
         return ring.get().getList();
     }
 
-
     public GpxPointNode getSelectedPoint() {
         return ring.get().getPoint();
     }
 
-
     public void setType(GpxType type) {
         ring.get().getList().setType(type);
     }
 
-
     public boolean undo() {
         return ring.undo();
     }
 
-
     public boolean redo() {
         return ring.redo();
     }
 
-
     public void simplify() {
         ring.add(ring.get().simplify());
     }