Changeset 15565 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

Timestamp:

2019-12-08T14:35:57+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18302 - support national taginfo instances

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -28 +28 @@
 import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
+import javax.swing.JMenuItem;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
@@ -109 +111 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Territories;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -172 +175 @@
     private final transient PopupMenuHandler blankSpaceMenuHandler = new PopupMenuHandler(blankSpaceMenu);
 
+    private final List<JMenuItem> tagMenuTagInfoNatItems = new ArrayList<>();
+    private final List<JMenuItem> membershipMenuTagInfoNatItems = new ArrayList<>();
+
     private final transient Map<String, Map<String, Integer>> valueCount = new TreeMap<>();
     /**
@@ -183 +189 @@
     private final TaginfoAction taginfoAction = new TaginfoAction(tagTable, editHelper::getDataKey, editHelper::getDataValues,
             membershipTable, x -> (IRelation<?>) membershipData.getValueAt(x, 0));
+    private final Collection<TaginfoAction> taginfoNationalActions = new ArrayList<>();
     private final PasteValueAction pasteValueAction = new PasteValueAction();
     private final CopyValueAction copyValueAction = new CopyValueAction(
@@ -348 +355 @@
     }
 
+    private void destroyTaginfoNationalActions() {
+        membershipMenuTagInfoNatItems.forEach(membershipMenu::remove);
+        membershipMenuTagInfoNatItems.clear();
+        tagMenuTagInfoNatItems.forEach(tagMenu::remove);
+        tagMenuTagInfoNatItems.clear();
+        taginfoNationalActions.forEach(JosmAction::destroy);
+        taginfoNationalActions.clear();
+    }
+
+    private void setupTaginfoNationalActions(Collection<? extends IPrimitive> newSel) {
+        destroyTaginfoNationalActions();
+        if (!newSel.isEmpty()) {
+            for (Entry<String, String> e : Territories.getNationalTaginfoUrls(
+                    newSel.iterator().next().getBBox().getCenter()).entrySet()) {
+                taginfoNationalActions.add(new TaginfoAction(tagTable, editHelper::getDataKey, editHelper::getDataValues,
+                        membershipTable, x -> (IRelation<?>) membershipData.getValueAt(x, 0), e.getValue(), e.getKey()));
+            }
+            membershipMenuTagInfoNatItems.addAll(taginfoNationalActions.stream().map(membershipMenu::add).collect(Collectors.toList()));
+            tagMenuTagInfoNatItems.addAll(taginfoNationalActions.stream().map(tagMenu::add).collect(Collectors.toList()));
+        }
+    }
+
     /**
      * Creates the popup menu @field membershipMenu and its launcher on membership table.
@@ -538 +567 @@
     public void destroy() {
         taginfoAction.destroy();
+        destroyTaginfoNationalActions();
         super.destroy();
         Config.getPref().removeKeyPreferenceChangeListener("display.discardable-keys", preferenceListener);
@@ -558 +588 @@
         // Ignore parameter as we do not want to operate always on real selection here, especially in draw mode
         Collection<? extends IPrimitive> newSel = OsmDataManager.getInstance().getInProgressISelection();
-        String selectedTag;
+        int newSelSize = newSel.size();
         IRelation<?> selectedRelation = null;
-        selectedTag = editHelper.getChangedKey(); // select last added or last edited key by default
+        String selectedTag = editHelper.getChangedKey(); // select last added or last edited key by default
         if (selectedTag == null && tagTable.getSelectedRowCount() == 1) {
             selectedTag = editHelper.getDataKey(tagTable.getSelectedRow());
@@ -598 +628 @@
                 count += e1.getValue();
             }
-            if (count < newSel.size()) {
-                e.getValue().put("", newSel.size() - count);
+            if (count < newSelSize) {
+                e.getValue().put("", newSelSize - count);
             }
             tagData.addRow(new Object[]{e.getKey(), e.getValue()});
@@ -655 +685 @@
         pluginHook.setVisible(hasSelection);
 
+        setupTaginfoNationalActions(newSel);
         autoresizeTagTable();
 
@@ -669 +700 @@
 
         if (tagData.getRowCount() != 0 || membershipData.getRowCount() != 0) {
-            if (newSel.size() > 1) {
+            if (newSelSize > 1) {
                 setTitle(tr("Objects: {2} / Tags: {0} / Memberships: {1}",
-                    tagData.getRowCount(), membershipData.getRowCount(), newSel.size()));
+                    tagData.getRowCount(), membershipData.getRowCount(), newSelSize));
             } else {
                 setTitle(tr("Tags: {0} / Memberships: {1}",