Changeset 25785 in osm for applications/editors/josm/plugins/trustosm/src/org

Timestamp:

2011-04-04T12:58:18+02:00 (14 years ago)

Author:

retsam

Message:

latest working trustosm plugin

Location:

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm

Files:

• actions/GetMissingDataAction.java (modified) (2 diffs)
• gui/dialogs/TrustDialog.java (modified) (3 diffs)
• gui/preferences (deleted)
• io/SigImporter.java (modified) (1 diff)
• io/SigReader.java (modified) (1 diff)

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/GetMissingDataAction.java

@@ -23 +23 @@
         public GetMissingDataAction() {
                 super(tr("Download OSM"),"getmissing",tr("Get all referenced but not actually present OSM objects from OSM server."),
-                                Shortcut.registerShortcut("gpg:download", tr("Download referenced osm objects..."), KeyEvent.VK_D, Shortcut.GROUP_MENU),true);
+                                Shortcut.registerShortcut("gpg:download", tr("Download referenced osm objects..."), KeyEvent.VK_T, Shortcut.GROUP_MENU),true);
         }
 
@@ -55 +55 @@
 
         public void getMissing(Map<String,TrustOsmPrimitive> trustitems, Collection<OsmPrimitive> missingData) {
-                Collection<OsmPrimitive> presentData = getCurrentDataSet().allPrimitives();
+                Collection<OsmPrimitive> presentData = Main.main.getCurrentDataSet().allPrimitives();
                 for (TrustOsmPrimitive t : trustitems.values()) {
                         OsmPrimitive osm = t.getOsmPrimitive();

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java

@@ -21 +21 @@
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -589 +588 @@
                                 trust = TrustOSMplugin.signedItems.get(id);
                                 sigsAvailable = true;
+                                /*
                                 Map<String,String> tags = osm.getKeys();
                                 Map<String, TrustSignatures>  signedTags = trust.getTagSigs();
@@ -596 +596 @@
                                         TrustSignatures sigs = signedTags.get(removedKey);
                                         sigs.setStatus( TrustSignatures.ITEM_REMOVED );
-                                        //tags.putAll(TrustOSMplugin.gpg.getKeyValueFromSignature(sigs.getLatestSignature()));
-                                }
-
+                                        String[] kv = TrustOsmPrimitive.generateTagsFromSigtext(sigs.getOnePlainText());
+                                        tags.put(kv[0],kv[1]);
+                                }
+                                 */
                         } else {
                                 trust = TrustOsmPrimitive.createTrustOsmPrimitive(osm);

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigImporter.java

@@ -50 +50 @@
                 //              Set<OsmPrimitive> missingData = new HashSet<OsmPrimitive>();
                 Map<String,TrustOsmPrimitive> trustitems = SigReader.parseSignatureXML(in, NullProgressMonitor.INSTANCE);
-
+                System.out.println(trustitems.size());
                 /*
                 int missingCount = missingData.size();

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java

@@ -194 +194 @@
          * @param source the source input stream. Must not be null.
          * @param progressMonitor  the progress monitor. If null, {@see NullProgressMonitor#INSTANCE} is assumed
-         * @param missingData   every OsmPrimitive that is not present in the current Datalayer while parsing is stored in that set
          *
          * @return a map of the parsed OSM Signatures (TrustOSMItem) with their related OSM-ID as key