Changeset 30334 in osm for applications/editors/josm/plugins

Timestamp:

2014-03-20T21:59:08+01:00 (11 years ago)

Author:

mkyral

Message:

PointInfo: Fix date format of start_date key. Add missing building:ruian:type key.

Location:

applications/editors/josm/plugins/pointInfo

Files:

• build.xml (modified) (2 diffs)
• servers/RUIAN/index.php (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/pointinfo/ruianModule.java (modified) (6 diffs)

applications/editors/josm/plugins/pointInfo/build.xml

@@ -15 +15 @@
 
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="PointInfo: Initial version"/>
+    <property name="commit.message" value="PointInfo: Fix format of start_date key"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="6238"/>
@@ -27 +27 @@
     <property name="plugin.author" value="Marian Kyral"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.pointinfo.PointInfoPlugin"/>
-    <property name="plugin.description" value="Shows an additional information about point on map. Currently only Czech Ruian module available."/>
+    <property name="plugin.description" value="Shows an additional information about point on map. There is only a Czech RUIAN module available at this moment."/>
     <property name="plugin.icon" value="images/mapmode/info-sml.png"/>
     <property name="plugin.link" value="https://github.com/mkyral/josm-pointInfo"/>

applications/editors/josm/plugins/pointInfo/servers/RUIAN/index.php

@@ -15 +15 @@
 $query="
   select s.kod,
-        s.pocet_podlazi, a.nazev, s.plati_od, s.pocet_bytu, s.dokonceni,
-        a.osmtag_k, a.osmtag_v
+        s.pocet_podlazi, a.nazev zpusob_vyuziti, s.plati_od, s.pocet_bytu, s.dokonceni,
+        s.zpusob_vyuziti_kod, a.osmtag_k, a.osmtag_v
   from rn_stavebni_objekt s
       left outer join osmtables.zpusob_vyuziti_objektu a on s.zpusob_vyuziti_kod = a.kod
@@ -33 +33 @@
     array( "ruian_id" => $row["kod"],
            "pocet_podlazi" => $row["pocet_podlazi"],
-           "zpusob_vyuziti" => $row["nazev"],
+           "zpusob_vyuziti" => $row["zpusob_vyuziti"],
+           "zpusob_vyuziti_kod" => $row["zpusob_vyuziti_kod"],
            "zpusob_vyuziti_key" => $row["osmtag_k"],
            "zpusob_vyuziti_val" => $row["osmtag_v"],

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

@@ -74 +74 @@
     @Override
     public void enterMode() {
-      System.out.println("enterMode() - start");
         if (!isEnabled()) {
             return;
@@ -81 +80 @@
         Main.map.mapView.setCursor(getCursor());
         Main.map.mapView.addMouseListener(this);
-      System.out.println("enterMode() - end");
 
     }
@@ -87 +85 @@
     @Override
     public void exitMode() {
-      System.out.println("exitMode() - start");
         super.exitMode();
         Main.map.mapView.removeMouseListener(this);
-      System.out.println("exitMode() - end");
     }
 

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

@@ -201 +201 @@
     private int      m_objekt_byty;
     private String   m_objekt_zpusob_vyuziti;
+    private String   m_objekt_zpusob_vyuziti_kod;
     private String   m_objekt_zpusob_vyuziti_key;
     private String   m_objekt_zpusob_vyuziti_val;
@@ -245 +246 @@
       m_objekt_byty = 0;
       m_objekt_zpusob_vyuziti = "";
+      m_objekt_zpusob_vyuziti_kod = "";
       m_objekt_zpusob_vyuziti_key = "";
       m_objekt_zpusob_vyuziti_val = "";
@@ -317 +319 @@
         try {
           m_objekt_zpusob_vyuziti = stavebniObjekt.getString("zpusob_vyuziti");
+        } catch (Exception e) {
+        }
+
+        try {
+          m_objekt_zpusob_vyuziti_kod = stavebniObjekt.getString("zpusob_vyuziti_kod");
         } catch (Exception e) {
         }
@@ -523 +530 @@
       r.append("<br/>");
       if (m_objekt_ruian_id > 0) {
-        r.append("<i><u>Informace o objektu</u></i>");
+        r.append("<i><u>Informace o budově</u></i>");
         r.append("&nbsp;&nbsp;<a href=file://tags.copy/building><img src="+getClass().getResource("/images/dialogs/copy-tags.png")+" border=0 alt=\"Vložit tagy do schránky\" ></a><br/>");
         r.append("<b>RUIAN id: </b><a href=http://vdp.cuzk.cz/vdp/ruian/stavebniobjekty/" + m_objekt_ruian_id +">" + m_objekt_ruian_id + "</a><br/>");
@@ -678 +685 @@
 
     /**
+     * Convert date from Czech to OSM format
+     * @param ruianDate Date in RUIAN (Czech) format DD.MM.YYYY
+     * @return String with date converted to OSM data format YYYY-MM-DD
+     */
+    String convertDate (String ruianDate) {
+      String r = new String();
+      String[] parts = ruianDate.split("\\.");
+      try {
+        int day =   Integer.parseInt(parts[0]);
+        int month = Integer.parseInt(parts[1]);
+        int year =  Integer.parseInt(parts[2]);
+        r = new Integer(year).toString() + "-" + String.format("%02d", month) + "-" + String.format("%02d", day);
+      } catch (Exception e) {
+      }
+
+      return r;
+    }
+
+    /**
      * Construct tag string for clipboard
      * @param k OSM Key
@@ -710 +736 @@
           c.append(tagToString("building:flats", Integer.toString(m_objekt_byty)));
         }
-        if (m_objekt_dokonceni.length() > 0) {
-          c.append(tagToString("start_date", m_objekt_dokonceni));
+        if (m_objekt_dokonceni.length() > 0 && convertDate(m_objekt_dokonceni).length() > 0) {
+          c.append(tagToString("start_date", convertDate(m_objekt_dokonceni)));
+        }
+        if (m_objekt_zpusob_vyuziti_kod.length() > 0) {
+          c.append(tagToString("building:ruian:type", m_objekt_zpusob_vyuziti_kod));
         }
         c.append(tagToString("source", "cuzk:ruian"));