ADD support for "sourcekey" entity in imagery.xml and controller/ControllerState.as.

http://trac.openstreetmap.org/ticket/3472

diff --git a/net/systemeD/potlatch2/controller/ControllerState.as b/net/systemeD/potlatch2/controller/ControllerState.as
index dec338844b8b8d0098e55c0dd9281d20beb6650d..3f9cb3150c9d76be5004f6239f64094d93a6610e 100644 (file)
--- a/net/systemeD/potlatch2/controller/ControllerState.as
+++ b/net/systemeD/potlatch2/controller/ControllerState.as
@@ -188,7 +188,10 @@ package net.systemeD.potlatch2.controller {
                protected function setSourceTag():void {
                        if (selectCount!=1) { return; }
                        if (Imagery.instance().selected && Imagery.instance().selected.sourcetag) {
-                               firstSelected.setTag('source',Imagery.instance().selected.sourcetag, MainUndoStack.getGlobalStack().addAction);
+                               if ("sourcekey" in Imagery.instance().selected)
+                                   firstSelected.setTag(Imagery.instance().selected.sourcekey,Imagery.instance().selected.sourcetag, MainUndoStack.getGlobalStack().addAction);
+                               else
+                                   firstSelected.setTag('source',Imagery.instance().selected.sourcetag, MainUndoStack.getGlobalStack().addAction);
                        }
                        controller.updateSelectionUI();
                }

diff --git a/resources/imagery.xml b/resources/imagery.xml
index 6164f7ea787d416c462b38dfa5130349b51983bf..fb84b529e3d05ab014ca632eda3dee956b7c796d 100644 (file)
--- a/resources/imagery.xml
+++ b/resources/imagery.xml
@@ -37,6 +37,7 @@
                <name>OS OpenData Locator</name>
                <url>http://tiles.itoworld.com/os_locator/$z/$x/$y.png</url>
                <sourcetag>OS OpenData Locator</sourcetag>
+               <sourcekey>source:name</sourcekey>
        </set>
        <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
                <name>OS 1:25k historic</name>