Changeset 34168 in osm for applications/editors/josm/plugins/pointInfo/src/org/openstreetmap

Timestamp:

2018-04-24T07:48:05+02:00 (6 years ago)

Author:

mkyral

Message:

PointInfo: Add Spanish Cadastre Web Services module.

Patch by Javier Sánchez Portero.

Location:

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo

Files:

• AbstractPointInfoModule.java (added)
• PointInfoAction.java (modified) (5 diffs)
• PointInfoPlugin.java (modified) (3 diffs)
• PointInfoPreference.java (added)
• PointInfoUtils.java (modified) (1 diff)
• ReverseFinder.java (added)
• ReverseRecord.java (added)
• catastro (added)
• catastro/AddrPlaces.java (added)
• catastro/CatastroModule.java (added)
• catastro/CatastroRecord.java (added)
• catastro/ObjectWithoutGeometry.java (added)
• ruian/RuianModule.java (modified) (4 diffs)

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java

@@ -25 +25 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.plugins.pointinfo.ruian.RuianModule;
+import org.openstreetmap.josm.plugins.pointinfo.AbstractPointInfoModule;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
@@ -37 +37 @@
 
     protected boolean cancel;
-    protected RuianModule mRuian = new RuianModule();
+    protected AbstractPointInfoModule module;
 
     private String htmlText = "";
@@ -76 +76 @@
 
         try {
+            module = PointInfoPlugin.getModule(pos);
             PleaseWaitRunnable infoTask = new PleaseWaitRunnable(tr("Connecting server")) {
                 @Override
@@ -95 +96 @@
                         msgLabel.addHyperlinkListener(hle -> {
                             if (HyperlinkEvent.EventType.ACTIVATED.equals(hle.getEventType())) {
+                                Logging.info(hle.getURL().toString());
                                 if (hle.getURL() == null || hle.getURL().toString().isEmpty()) {
                                     return;
                                 }
-                                System.out.println("URL: "+ hle.getURL());
                                 if (!hle.getURL().toString().startsWith("http")) {
-                                    mRuian.performAction(hle.getURL().toString());
+                                    module.performAction(hle.getURL().toString());
                                 } else {
                                     String ret = OpenBrowser.displayUrl(hle.getURL().toString());
@@ -132 +133 @@
         progressMonitor.beginTask(null, 3);
         try {
-            mRuian.prepareData(pos);
-            htmlText = mRuian.getHtml();
+            module.prepareData(pos);
+            htmlText = module.getHtml();
             coordinatesText = PointInfoUtils.formatCoordinates(pos.lat(), pos.lon());
 

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoPlugin.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.pointinfo;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.plugins.pointinfo.ruian.RuianModule;
+import org.openstreetmap.josm.plugins.pointinfo.catastro.CatastroModule;
 
 /**
@@ -12 +23 @@
  */
 public class PointInfoPlugin extends Plugin {
+
+    private static final HashMap<String, AbstractPointInfoModule> modules = new HashMap<>();
+    static {
+        registerModule(new RuianModule());
+        registerModule(new CatastroModule());
+    }
 
     /**
@@ -21 +38 @@
         MainMenu.add(MainApplication.getMenu().moreToolsMenu, new PointInfoAction());
     }
+
+    @Override
+    public PreferenceSetting getPreferenceSetting() {
+        return new PointInfoPreference();
+    }
+
+    /**
+     * Register a module as available to select in the preferences.
+     * @param module PointInfo module
+     */
+    public static void registerModule(AbstractPointInfoModule module) {
+        modules.put(module.getName(), module);
+    }
+
+    /**
+     * Returns a list of available modules names
+     * @return modsList
+     */
+    public static List<String> getModules() {
+        return new ArrayList<>(modules.keySet());
+    }
+
+    /**
+     * Returns a valid module for this point. If auto mode is selected, returns
+     * the first valid module for the area in the given position
+     the currently selected module
+     * @param pos position LatLon
+     * @return module
+     * @throws IOException if any IO error occurs.
+    */
+    public static AbstractPointInfoModule getModule(LatLon pos) throws IOException {
+        AbstractPointInfoModule module;
+        module = null;
+        if (Main.pref.getBoolean("plugin.pointinfo.automode", true)) {
+            ReverseRecord r = ReverseFinder.queryNominatim(pos);
+            Iterator i = modules.values().iterator();
+            while (module == null && i.hasNext()) {
+                AbstractPointInfoModule m = (AbstractPointInfoModule) i.next();
+                if (r.matchAnyArea(m.getArea())) {
+                    module = m;
+                }
+            }
+        } else {
+            module = modules.get(Main.pref.get("plugin.pointinfo.module", "RUIAN"));
+        }
+        if (module == null) {
+            module = modules.get("RUIAN");
+        }
+        return module;
+    }
 }

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoUtils.java

@@ -38 +38 @@
     /**
      * Return text representation of coordinates.
-     # @param  lat Lat coordinate
-     # @param  lon Lon coordinate
+     * @param lat the lat part of coordinates
+     * @param lon the lon part of coordinates
      * @return String coordinatesText
      */

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianModule.java

@@ -8 +8 @@
 import org.openstreetmap.josm.tools.Logging;
 
+import org.openstreetmap.josm.plugins.pointinfo.AbstractPointInfoModule;
+
 /**
  * A module for the Czech RUIAN database
  * @author Marián Kyral
  */
-public class RuianModule {
+public class RuianModule extends AbstractPointInfoModule {
 
-    private String URL = "http://josm.poloha.net/pointInfo/v4/index.php";
+    private static final String moduleName = "RUIAN";
+    private static final String areaName = "cz";
+    private static final String URL = "http://josm.poloha.net/pointInfo/v4/index.php";
 
     private RuianRecord m_record = new RuianRecord();
@@ -22 +26 @@
     }
 
-    /**
-     * Return Html text representation
-     * @return String htmlText
-     */
+    @Override
     public String getHtml() {
         return m_record.getHtml();
     }
 
-    /**
-     * Perform given action
-     *  e.g.: copy tags to clipboard
-     * @param act Action to be performed
-     */
+    @Override
     public void performAction(String act) {
         m_record.performAction(act);
@@ -43 +40 @@
      * @param pos Position on the map
      */
+    @Override
     public void prepareData(LatLon pos) {
         try {
@@ -51 +49 @@
         }
     }
+
+    @Override
+    public String getName() {
+        return moduleName;   
+    }
+
+    @Override
+    public String getArea() {
+        return areaName;
+    }
 }