Index: applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoPlugin.java =================================================================== --- applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoPlugin.java (revision 35583) +++ applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoPlugin.java (revision 36122) @@ -73,7 +73,7 @@ if (Config.getPref().getBoolean("plugin.pointinfo.automode", true)) { ReverseRecord r = ReverseFinder.queryNominatim(pos); - Iterator i = modules.values().iterator(); + Iterator i = modules.values().iterator(); while (module == null && i.hasNext()) { - AbstractPointInfoModule m = (AbstractPointInfoModule) i.next(); + AbstractPointInfoModule m = i.next(); if (r.matchAnyArea(m.getArea())) { module = m; Index: applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ReverseFinder.java =================================================================== --- applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ReverseFinder.java (revision 35583) +++ applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ReverseFinder.java (revision 36122) @@ -4,11 +4,11 @@ import java.io.ByteArrayInputStream; import java.io.IOException; -import java.net.URL; +import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.Locale; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.openstreetmap.josm.data.coor.LatLon; @@ -19,5 +19,5 @@ * @author Javier Sánchez Portero */ -public class ReverseFinder { +public final class ReverseFinder { public static final String NOMINATIM_URL = "https://nominatim.openstreetmap.org/reverse?format=json&lat=%f&lon=%f"; @@ -34,10 +34,9 @@ public static ReverseRecord queryNominatim(LatLon pos) throws IOException { String request = String.format(Locale.ENGLISH, NOMINATIM_URL, pos.lat(), pos.lon()); - String result = HttpClient.create(new URL(request)).connect().fetchContent(); + String result = HttpClient.create(URI.create(request).toURL()).connect().fetchContent(); JsonReader jsonReader = Json.createReader(new ByteArrayInputStream(result.getBytes(StandardCharsets.UTF_8))); JsonObject obj = jsonReader.readObject(); jsonReader.close(); - ReverseRecord record = new ReverseRecord(obj); - return record; + return new ReverseRecord(obj); } } Index: applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ReverseRecord.java =================================================================== --- applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ReverseRecord.java (revision 35583) +++ applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ReverseRecord.java (revision 36122) @@ -2,5 +2,5 @@ package org.openstreetmap.josm.plugins.pointinfo; -import javax.json.JsonObject; +import jakarta.json.JsonObject; /** @@ -73,5 +73,5 @@ * @return match area matched */ - public Boolean matchAnyArea(String area) { + public boolean matchAnyArea(String area) { if (area.equals(countryCode)) return true; if (area.equals(country)) return true; Index: applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/catastro/CatastroRecord.java =================================================================== --- applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/catastro/CatastroRecord.java (revision 35583) +++ applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/catastro/CatastroRecord.java (revision 36122) @@ -2,6 +2,5 @@ package org.openstreetmap.josm.plugins.pointinfo.catastro; -import static org.openstreetmap.josm.tools.I18n.tr; - +import java.io.IOException; import java.io.InputStream; import java.io.ByteArrayInputStream; @@ -9,9 +8,11 @@ import java.util.ArrayList; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.ParserConfigurationException; + import org.w3c.dom.Document; import org.w3c.dom.NodeList; @@ -20,5 +21,5 @@ import org.openstreetmap.josm.tools.Logging; -import java.util.logging.Level; +import org.xml.sax.SAXException; /** @@ -50,6 +51,6 @@ */ private void init() { - errors = new ArrayList(); - coords = new ArrayList(); + errors = new ArrayList<>(); + coords = new ArrayList<>(); } @@ -68,53 +69,45 @@ parseErrors(doc); parseCoordenadas(doc); - } catch (Exception e) { - Logging.log(Level.WARNING, e); + } catch (ParserConfigurationException | SAXException | IOException e) { + Logging.warn(e); } } private void parseErrors(Document doc) { - try { - NodeList nList = doc.getElementsByTagName("err"); - for (int temp = 0; temp < nList.getLength(); temp++) { - Node nNode = nList.item(temp); - if (nNode.getNodeType() == Node.ELEMENT_NODE) { - Element eElement = (Element) nNode; - String code = eElement.getElementsByTagName("cod").item(0).getTextContent(); - String desc = eElement.getElementsByTagName("des").item(0).getTextContent(); - JsonObject error = Json.createObjectBuilder() - .add("code", code) - .add("desc", desc) - .build(); - errors.add(error); - Logging.info("Error: (" + code + ") " + desc); - } + NodeList nList = doc.getElementsByTagName("err"); + for (int temp = 0; temp < nList.getLength(); temp++) { + Node nNode = nList.item(temp); + if (nNode.getNodeType() == Node.ELEMENT_NODE) { + Element eElement = (Element) nNode; + String code = eElement.getElementsByTagName("cod").item(0).getTextContent(); + String desc = eElement.getElementsByTagName("des").item(0).getTextContent(); + JsonObject error = Json.createObjectBuilder() + .add("code", code) + .add("desc", desc) + .build(); + errors.add(error); + Logging.info("Error: (" + code + ") " + desc); } - } catch (Exception e) { - Logging.log(Level.WARNING, "errors:", e); } } private void parseCoordenadas(Document doc) { - try { - NodeList nList = doc.getElementsByTagName("coord"); - for (int temp = 0; temp < nList.getLength(); temp++) { - Node nNode = nList.item(temp); - if (nNode.getNodeType() == Node.ELEMENT_NODE) { - Element eElement = (Element) nNode; - String ref = eElement.getElementsByTagName("pc1").item(0).getTextContent() - + eElement.getElementsByTagName("pc2").item(0).getTextContent(); - String address = eElement.getElementsByTagName("ldt") - .item(0).getTextContent(); - JsonObject coord = Json.createObjectBuilder() - .add("ref", ref) - .add("address", address) - .build(); - coords.add(coord); - Logging.info("Referencia Catastral: " + ref); - Logging.info("Dirección: " + address); - } + NodeList nList = doc.getElementsByTagName("coord"); + for (int temp = 0; temp < nList.getLength(); temp++) { + Node nNode = nList.item(temp); + if (nNode.getNodeType() == Node.ELEMENT_NODE) { + Element eElement = (Element) nNode; + String ref = eElement.getElementsByTagName("pc1").item(0).getTextContent() + + eElement.getElementsByTagName("pc2").item(0).getTextContent(); + String address = eElement.getElementsByTagName("ldt") + .item(0).getTextContent(); + JsonObject coord = Json.createObjectBuilder() + .add("ref", ref) + .add("address", address) + .build(); + coords.add(coord); + Logging.info("Referencia Catastral: " + ref); + Logging.info("Dirección: " + address); } - } catch (Exception e) { - Logging.log(Level.WARNING, "coordenadas:", e); } } @@ -130,18 +123,19 @@ for (JsonObject coord: coords) { r.append("Información de la parcela
"); - r.append("Referencia Catastral: " + coord.getString("ref") + "
"); - r.append("Dirección: " + coord.getString("address") + "
"); - r.append("Fotografía de fachada: " - + "Enlace a web de Catastro (metadatos)

"); + r.append("Referencia Catastral: ").append(coord.getString("ref")).append("
"); + r.append("Dirección: ").append(coord.getString("address")).append("
"); + r.append("Fotografía de fachada: ") + .append("Enlace a web de Catastro (metadatos)

"); } - if (errors.size() > 0) { + if (!errors.isEmpty()) { r.append("Errores
"); } for (JsonObject error: errors) { - r.append("(" + error.getString("code") + ") "); - r.append(error.getString("desc") + "
"); + r.append("(").append(error.getString("code")).append(") "); + r.append(error.getString("desc")).append("
"); } r.append("
"); Index: applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianRecord.java =================================================================== --- applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianRecord.java (revision 35583) +++ applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianRecord.java (revision 36122) @@ -9,13 +9,15 @@ import java.util.Arrays; import java.util.Collection; +import java.util.IllegalFormatException; import java.util.LinkedList; import java.util.logging.Level; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; - +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.json.JsonValue; + +import org.apache.commons.jcs3.access.exception.InvalidArgumentException; import org.openstreetmap.josm.command.AddCommand; import org.openstreetmap.josm.command.Command; @@ -39,42 +41,42 @@ // CHECKSTYLE.OFF: SingleSpaceSeparator - private double m_coor_lat, m_coor_lon; - private String m_source; - - private long m_objekt_ruian_id; - private int m_objekt_podlazi; - 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; - private String m_objekt_dokonceni; - private String m_objekt_plati_od; - - private String m_err_user; - private String m_err_date; - private String m_err_type; - private String m_err_note; - - private ArrayList m_so_bez_geometrie; - - private ArrayList m_adresni_mista; - - private long m_parcela_ruian_id; - private String m_parcela_druh_pozemku; - private String m_parcela_zpusob_vyuziti; - private String m_parcela_plati_od; - - private long m_ulice_ruian_id; - private String m_ulice_jmeno; - - private long m_katastr_ruian_id; - private String m_katastr_nazev; - private long m_katastr_obec_kod; - private String m_katastr_obec; - private long m_katastr_okres_kod; - private String m_katastr_okres; - private long m_katastr_kraj_kod; - private String m_katastr_kraj; + private double mCoorLat, mCoorLon; + private String mSource; + + private long mObjektRuianId; + private int mObjektPodlazi; + private int mObjektByty; + private String mObjektZpusobVyuziti; + private String mObjektZpusobVyuzitiKod; + private String mObjektZpusobVyuzitiKey; + private String mObjektZpusobVyuzitiVal; + private String mObjektDokonceni; + private String mObjektPlatiOd; + + private String mErrUser; + private String mErrDate; + private String mErrType; + private String mErrNote; + + private ArrayList mSoBezGeometrie; + + private ArrayList mAdresniMista; + + private long mParcelaRuianId; + private String mParcelaDruhPozemku; + private String mParcelaZpusobVyuziti; + private String mParcelaPlatiOd; + + private long mUliceRuianId; + private String mUliceJmeno; + + private long mKatastrRuianId; + private String mKatastrNazev; + private long mKatastrObecKod; + private String mKatastrObec; + private long mKatastrOkresKod; + private String mKatastrOkres; + private long mKatastrKrajKod; + private String mKatastrKraj; // CHECKSTYLE.ON: SingleSpaceSeparator @@ -93,42 +95,42 @@ private void init() { - m_coor_lat = 0; - m_coor_lon = 0; - m_source = ""; - - m_objekt_ruian_id = 0; - m_objekt_podlazi = 0; - m_objekt_byty = 0; - m_objekt_zpusob_vyuziti = ""; - m_objekt_zpusob_vyuziti_kod = ""; - m_objekt_zpusob_vyuziti_key = ""; - m_objekt_zpusob_vyuziti_val = ""; - m_objekt_dokonceni = ""; - m_objekt_plati_od = ""; - - m_err_user = ""; - m_err_date = ""; - m_err_type = ""; - m_err_note = ""; - - m_so_bez_geometrie = new ArrayList<>(); - m_adresni_mista = new ArrayList<>(); - - m_parcela_ruian_id = 0; - m_parcela_druh_pozemku = ""; - m_parcela_zpusob_vyuziti = ""; - m_parcela_plati_od = ""; - - m_ulice_ruian_id = 0; - m_ulice_jmeno = ""; - - m_katastr_ruian_id = 0; - m_katastr_nazev = ""; - m_katastr_obec_kod = 0; - m_katastr_obec = ""; - m_katastr_okres_kod = 0; - m_katastr_okres = ""; - m_katastr_kraj_kod = 0; - m_katastr_kraj = ""; + mCoorLat = 0; + mCoorLon = 0; + mSource = ""; + + mObjektRuianId = 0; + mObjektPodlazi = 0; + mObjektByty = 0; + mObjektZpusobVyuziti = ""; + mObjektZpusobVyuzitiKod = ""; + mObjektZpusobVyuzitiKey = ""; + mObjektZpusobVyuzitiVal = ""; + mObjektDokonceni = ""; + mObjektPlatiOd = ""; + + mErrUser = ""; + mErrDate = ""; + mErrType = ""; + mErrNote = ""; + + mSoBezGeometrie = new ArrayList<>(); + mAdresniMista = new ArrayList<>(); + + mParcelaRuianId = 0; + mParcelaDruhPozemku = ""; + mParcelaZpusobVyuziti = ""; + mParcelaPlatiOd = ""; + + mUliceRuianId = 0; + mUliceJmeno = ""; + + mKatastrRuianId = 0; + mKatastrNazev = ""; + mKatastrObecKod = 0; + mKatastrObec = ""; + mKatastrOkresKod = 0; + mKatastrOkres = ""; + mKatastrKrajKod = 0; + mKatastrKraj = ""; } @@ -169,5 +171,5 @@ } - private JsonObject getSafeJsonObject(JsonObject obj, String key) { + private static JsonObject getSafeJsonObject(JsonObject obj, String key) { JsonValue val = obj.get(key); if (val instanceof JsonObject) { @@ -187,23 +189,23 @@ try { - m_coor_lat = Double.parseDouble(coorObjekt.getString("lat")); + mCoorLat = Double.parseDouble(coorObjekt.getString("lat")); } catch (NumberFormatException e) { - Logging.log(Level.WARNING, "coordinates.lat:", e); - } - - try { - m_coor_lon = Double.parseDouble(coorObjekt.getString("lon")); + Logging.warn("coordinates.lat: {0}", e); + } + + try { + mCoorLon = Double.parseDouble(coorObjekt.getString("lon")); } catch (NumberFormatException e) { - Logging.log(Level.WARNING, "coordinates.lon:", e); - } - - try { - m_source = obj.getString("source"); + Logging.warn("coordinates.lon: {0}", e); + } + + try { + mSource = obj.getString("source"); } catch (RuntimeException e) { - Logging.log(Level.WARNING, "source:", e); - } - - } catch (Exception e) { - Logging.log(Level.WARNING, "coordinates:", e); + Logging.warn("source: {0}", e); + } + + } catch (ClassCastException e) { + Logging.warn("coordinates: {0}", e); } } @@ -214,59 +216,35 @@ try { - m_objekt_ruian_id = Long.parseLong(stavebniObjekt.getString("ruian_id")); - } catch (Exception e) { + mObjektRuianId = Long.parseLong(stavebniObjekt.getString("ruian_id", null)); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "stavebni_objekt.ruian_id:", e); } try { - m_objekt_podlazi = Integer.parseInt(stavebniObjekt.getString("pocet_podlazi")); - } catch (Exception e) { + mObjektPodlazi = Integer.parseInt(stavebniObjekt.getString("pocet_podlazi", null)); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "stavebni_objekt.pocet_podlazi:", e); } try { - m_objekt_byty = Integer.parseInt(stavebniObjekt.getString("pocet_bytu")); - } catch (Exception e) { + mObjektByty = Integer.parseInt(stavebniObjekt.getString("pocet_bytu", null)); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "stavebni_objekt.pocet_bytu:", e); } - try { - m_objekt_zpusob_vyuziti = stavebniObjekt.getString("zpusob_vyuziti"); - } catch (Exception e) { - Logging.log(Level.WARNING, "stavebni_objekt.zpusob_vyuziti:", e); - } - - try { - m_objekt_zpusob_vyuziti_kod = stavebniObjekt.getString("zpusob_vyuziti_kod"); - } catch (Exception e) { - Logging.log(Level.WARNING, "stavebni_objekt.m_objekt_zpusob_vyuziti_kod:", e); - } - - try { - m_objekt_zpusob_vyuziti_key = stavebniObjekt.getString("zpusob_vyuziti_key"); - } catch (Exception e) { - Logging.log(Level.WARNING, "stavebni_objekt.zpusob_vyuziti_key:", e); - } - - try { - m_objekt_zpusob_vyuziti_val = stavebniObjekt.getString("zpusob_vyuziti_val"); - } catch (Exception e) { - Logging.log(Level.WARNING, "stavebni_objekt.m_objekt_zpusob_vyuziti_val:", e); - } - - try { - m_objekt_plati_od = stavebniObjekt.getString("plati_od"); - } catch (Exception e) { - Logging.log(Level.WARNING, "stavebni_objekt.plati_od:", e); - } - - try { - m_objekt_dokonceni = stavebniObjekt.getString("dokonceni"); - } catch (Exception e) { - Logging.log(Level.WARNING, "stavebni_objekt.dokonceni:", e); - } - - } catch (Exception e) { - Logging.log(Level.WARNING, "stavebni_objekt:", e); + mObjektZpusobVyuziti = stavebniObjekt.getString("zpusob_vyuziti", null); + + mObjektZpusobVyuzitiKod = stavebniObjekt.getString("zpusob_vyuziti_kod", null); + + mObjektZpusobVyuzitiKey = stavebniObjekt.getString("zpusob_vyuziti_key", null); + + mObjektZpusobVyuzitiVal = stavebniObjekt.getString("zpusob_vyuziti_val", null); + + mObjektPlatiOd = stavebniObjekt.getString("plati_od", null); + + mObjektDokonceni = stavebniObjekt.getString("dokonceni", null); + + } catch (IllegalArgumentException e) { + Logging.warn("stavebni_objekt: {0}", e); } } @@ -276,30 +254,14 @@ JsonObject errObjekt = getSafeJsonObject(obj, "nahlaseny_problem"); - try { - m_err_user = errObjekt.getString("uzivatel"); - } catch (Exception e) { - Logging.log(Level.WARNING, "nahlaseny_problem.uzivatel:", e); - } - - try { - m_err_date = errObjekt.getString("datum"); - } catch (Exception e) { - Logging.log(Level.WARNING, "nahlaseny_problem.datum:", e); - } - - try { - m_err_type = errObjekt.getString("duvod"); - } catch (Exception e) { - Logging.log(Level.WARNING, "nahlaseny_problem.duvod:", e); - } - - try { - m_err_note = errObjekt.getString("poznamka"); - } catch (Exception e) { - Logging.log(Level.WARNING, "nahlaseny_problem.poznamka:", e); - } - - } catch (Exception e) { - Logging.log(Level.WARNING, "nahlaseny_problem:", e); + mErrUser = errObjekt.getString("uzivatel", null); + + mErrDate = errObjekt.getString("datum", null); + + mErrType = errObjekt.getString("duvod", null); + + mErrNote = errObjekt.getString("poznamka", null); + + } catch (IllegalArgumentException e) { + Logging.warn("nahlaseny_problem: {0}", e); } } @@ -314,67 +276,43 @@ try { - so.setRuianID(Long.parseLong(soBezGeom.getString("ruian_id"))); - } catch (Exception e) { + so.setRuianID(Long.parseLong(soBezGeom.getString("ruian_id", null))); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "so_bez_geometrie.ruian_id:", e); } try { - so.setPodlazi(Integer.parseInt(soBezGeom.getString("pocet_podlazi"))); - } catch (Exception e) { + so.setPodlazi(Integer.parseInt(soBezGeom.getString("pocet_podlazi", null))); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "so_bez_geometrie.pocet_podlazi:", e); } try { - so.setByty(Integer.parseInt(soBezGeom.getString("pocet_bytu"))); - } catch (Exception e) { + so.setByty(Integer.parseInt(soBezGeom.getString("pocet_bytu", null))); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "so_bez_geometrie.pocet_bytu:", e); } - try { - so.setZpusobVyuziti(soBezGeom.getString("zpusob_vyuziti")); - } catch (Exception e) { - Logging.log(Level.WARNING, "so_bez_geometrie.zpusob_vyuziti:", e); - } - - try { - so.setZpusobVyuzitiKod(soBezGeom.getString("zpusob_vyuziti_kod")); - } catch (Exception e) { - Logging.log(Level.WARNING, "so_bez_geometrie.zpusob_vyuziti_kod:", e); - } - - try { - so.setZpusobVyuzitiKey(soBezGeom.getString("zpusob_vyuziti_key")); - } catch (Exception e) { - Logging.log(Level.WARNING, "so_bez_geometrie.zpusob_vyuziti_key:", e); - } - - try { - so.setZpusobVyuzitiVal(soBezGeom.getString("zpusob_vyuziti_val")); - } catch (Exception e) { - Logging.log(Level.WARNING, "so_bez_geometrie.zpusob_vyuziti_val:", e); - } - - try { - so.setDokonceni(soBezGeom.getString("dokonceni")); - } catch (Exception e) { - Logging.log(Level.WARNING, "so_bez_geometrie.dokonceni:", e); - } - - try { - so.setPlatiOd(soBezGeom.getString("plati_od")); - } catch (Exception e) { - Logging.log(Level.WARNING, "so_bez_geometrie.plati_od:", e); - } - - try { - so.setVzdalenost(Float.parseFloat(soBezGeom.getString("vzdalenost"))); - } catch (Exception e) { - Logging.log(Level.WARNING, "so_bez_geometrie.vzdalenost:", e); - } - - m_so_bez_geometrie.add(so); - } - } catch (Exception e) { - Logging.log(Level.WARNING, "so_bez_geometrie:", e); + so.setZpusobVyuziti(soBezGeom.getString("zpusob_vyuziti", null)); + + so.setZpusobVyuzitiKod(soBezGeom.getString("zpusob_vyuziti_kod", null)); + + so.setZpusobVyuzitiKey(soBezGeom.getString("zpusob_vyuziti_key", null)); + + so.setZpusobVyuzitiVal(soBezGeom.getString("zpusob_vyuziti_val", null)); + + so.setDokonceni(soBezGeom.getString("dokonceni", null)); + + so.setPlatiOd(soBezGeom.getString("plati_od", null)); + + try { + so.setVzdalenost(Float.parseFloat(soBezGeom.getString("vzdalenost", null))); + } catch (NumberFormatException e) { + Logging.warn("so_bez_geometrie.vzdalenost: {0}", e); + } + + mSoBezGeometrie.add(so); + } + } catch (ClassCastException e) { + Logging.warn("so_bez_geometrie: {0}", e); } } @@ -389,6 +327,6 @@ try { - am.setRuianID(Long.parseLong(adresniMisto.getString("ruian_id"))); - } catch (Exception e) { + am.setRuianID(Long.parseLong(adresniMisto.getString("ruian_id", null))); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "adresni_mista.ruian_id:", e); } @@ -396,123 +334,85 @@ try { JsonArray node = adresniMisto.getJsonArray("pozice"); - am.setPosition(new LatLon( - LatLon.roundToOsmPrecision(node.getJsonNumber(1).doubleValue()), - LatLon.roundToOsmPrecision(node.getJsonNumber(0).doubleValue())) - ); - } catch (Exception e) { + if (node.size() >= 2) { + am.setPosition(new LatLon( + LatLon.roundToOsmPrecision(node.getJsonNumber(1).doubleValue()), + LatLon.roundToOsmPrecision(node.getJsonNumber(0).doubleValue())) + ); + } + } catch (ClassCastException e) { Logging.log(Level.WARNING, "adresni_mista.pozice:", e); } try { - am.setBudovaID(Long.parseLong(adresniMisto.getString("budova_kod"))); - } catch (Exception e) { + am.setBudovaID(Long.parseLong(adresniMisto.getString("budova_kod", null))); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "adresni_mista.budova_kod:", e); } - try { - am.setCisloTyp(adresniMisto.getString("cislo_typ")); - } catch (Exception e) { - Logging.log(Level.WARNING, "adresni_mista.cislo_typ:", e); - } - - try { - am.setCisloDomovni(adresniMisto.getString("cislo_domovni")); - } catch (Exception e) { - Logging.log(Level.WARNING, "adresni_mista.cislo_domovni:", e); - } - - try { - am.setCisloOrientacni(adresniMisto.getString("cislo_orientacni")); - } catch (Exception e) { - Logging.log(Level.WARNING, "adresni_mista.cislo_orientacni:", e); - } - - try { - am.setUliceID(Long.parseLong(adresniMisto.getString("ulice_kod"))); - } catch (Exception e) { + am.setCisloTyp(adresniMisto.getString("cislo_typ", null)); + + am.setCisloDomovni(adresniMisto.getString("cislo_domovni", null)); + + am.setCisloOrientacni(adresniMisto.getString("cislo_orientacni", null)); + + try { + am.setUliceID(Long.parseLong(adresniMisto.getString("ulice_kod", null))); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "adresni_mista.ulice_kod:", e); } - try { - am.setUlice(adresniMisto.getString("ulice")); - } catch (Exception e) { - Logging.log(Level.WARNING, "adresni_mista.ulice:", e); - } - - try { - am.setCastObceID(Long.parseLong(adresniMisto.getString("cast_obce_kod"))); - } catch (Exception e) { + am.setUlice(adresniMisto.getString("ulice", null)); + + try { + am.setCastObceID(Long.parseLong(adresniMisto.getString("cast_obce_kod", null))); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "adresni_mista.cast_obce_kod:", e); } - try { - am.setCastObce(adresniMisto.getString("cast_obce")); - } catch (Exception e) { - Logging.log(Level.WARNING, "adresni_mista.m_cast_obce:", e); - } - - try { - am.setMestskaCastID(Long.parseLong(adresniMisto.getString("mestska_cast_kod"))); - } catch (Exception e) { + am.setCastObce(adresniMisto.getString("cast_obce", null)); + + try { + am.setMestskaCastID(Long.parseLong(adresniMisto.getString("mestska_cast_kod", null))); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "adresni_mista.mestska_cast_kod:", e); } - try { - am.setMestskaCast(adresniMisto.getString("mestska_cast")); - } catch (Exception e) { - Logging.log(Level.WARNING, "adresni_mista.mestska_cast:", e); - } - - try { - am.setObecID(Long.parseLong(adresniMisto.getString("obec_kod"))); - } catch (Exception e) { + am.setMestskaCast(adresniMisto.getString("mestska_cast", null)); + + try { + am.setObecID(Long.parseLong(adresniMisto.getString("obec_kod", null))); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "adresni_mista.obec_kod:", e); } - try { - am.setObec(adresniMisto.getString("obec")); - } catch (Exception e) { - Logging.log(Level.WARNING, "adresni_mista.obec:", e); - } - - try { - am.setOkresID(Long.parseLong(adresniMisto.getString("okres_kod"))); - } catch (Exception e) { + am.setObec(adresniMisto.getString("obec", null)); + + try { + am.setOkresID(Long.parseLong(adresniMisto.getString("okres_kod", null))); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "adresni_mista.okres_kod:", e); } - try { - am.setOkres(adresniMisto.getString("okres")); - } catch (Exception e) { - Logging.log(Level.WARNING, "adresni_mista.okres:", e); - } - - try { - am.setKrajID(Long.parseLong(adresniMisto.getString("kraj_kod"))); - } catch (Exception e) { + am.setOkres(adresniMisto.getString("okres", null)); + + try { + am.setKrajID(Long.parseLong(adresniMisto.getString("kraj_kod", null))); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "adresni_mista.kraj_kod:", e); } - try { - am.setKraj(adresniMisto.getString("kraj")); - } catch (Exception e) { - Logging.log(Level.WARNING, "adresni_mista.kraj:", e); - } - - try { - am.setPsc(adresniMisto.getString("psc")); - } catch (Exception e) { - Logging.log(Level.WARNING, "adresni_mista.psc:", e); - } - - try { - am.setVzdalenost(Float.parseFloat(adresniMisto.getString("vzdalenost"))); - } catch (Exception e) { + am.setKraj(adresniMisto.getString("kraj", null)); + + am.setPsc(adresniMisto.getString("psc", null)); + + try { + am.setVzdalenost(Float.parseFloat(adresniMisto.getString("vzdalenost", null))); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "adresni_mista.vzdalenost:", e); } - m_adresni_mista.add(am); - } - } catch (Exception e) { + mAdresniMista.add(am); + } + } catch (ClassCastException e) { Logging.log(Level.WARNING, "adresni_mista:", e); } @@ -524,28 +424,15 @@ try { - m_parcela_ruian_id = Long.parseLong(parcela.getString("ruian_id")); - } catch (Exception e) { + mParcelaRuianId = Long.parseLong(parcela.getString("ruian_id", null)); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "parcela.ruian_id:", e); } - try { - m_parcela_druh_pozemku = parcela.getString("druh_pozemku"); - } catch (Exception e) { - Logging.log(Level.WARNING, "parcela.druh_pozemku:", e); - } - - try { - m_parcela_zpusob_vyuziti = parcela.getString("zpusob_vyuziti"); - } catch (Exception e) { - Logging.log(Level.WARNING, "parcela.zpusob_vyuziti:", e); - } - - try { - m_parcela_plati_od = parcela.getString("plati_od"); - } catch (Exception e) { - Logging.log(Level.WARNING, "parcela.plati_od:", e); - } - - } catch (Exception e) { + mParcelaDruhPozemku = parcela.getString("druh_pozemku", null); + + mParcelaZpusobVyuziti = parcela.getString("zpusob_vyuziti", null); + + mParcelaPlatiOd = parcela.getString("plati_od", null); + } catch (InvalidArgumentException e) { Logging.log(Level.WARNING, "parcela:", e); } @@ -557,16 +444,12 @@ try { - m_ulice_ruian_id = Long.parseLong(ulice.getString("ruian_id")); - } catch (Exception e) { + mUliceRuianId = Long.parseLong(ulice.getString("ruian_id", null)); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "ulice.ruian_id:", e); } - try { - m_ulice_jmeno = ulice.getString("jmeno"); - } catch (Exception e) { - Logging.log(Level.WARNING, "ulice.jmeno:", e); - } - - } catch (Exception e) { + mUliceJmeno = ulice.getString("jmeno", null); + + } catch (IllegalArgumentException e) { Logging.log(Level.WARNING, "ulice:", e); } @@ -578,52 +461,36 @@ try { - m_katastr_ruian_id = Long.parseLong(katastr.getString("ruian_id")); - } catch (Exception e) { + mKatastrRuianId = Long.parseLong(katastr.getString("ruian_id", null)); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "katastr.ruian_id:", e); } - try { - m_katastr_nazev = katastr.getString("nazev"); - } catch (Exception e) { - Logging.log(Level.WARNING, "katastr.nazev:", e); - } - - try { - m_katastr_obec_kod = Long.parseLong(katastr.getString("obec_kod")); - } catch (Exception e) { + mKatastrNazev = katastr.getString("nazev", null); + + try { + mKatastrObecKod = Long.parseLong(katastr.getString("obec_kod", null)); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "katastr.obec_kod:", e); } - try { - m_katastr_obec = katastr.getString("obec"); - } catch (Exception e) { - Logging.log(Level.WARNING, "katastr.okres:", e); - } - - try { - m_katastr_okres_kod = Long.parseLong(katastr.getString("okres_kod")); - } catch (Exception e) { + mKatastrObec = katastr.getString("obec", null); + + try { + mKatastrOkresKod = Long.parseLong(katastr.getString("okres_kod", null)); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "katastr.okres_kod:", e); } - try { - m_katastr_okres = katastr.getString("okres"); - } catch (Exception e) { - Logging.log(Level.WARNING, "katastr.okres:", e); - } - - try { - m_katastr_kraj_kod = Long.parseLong(katastr.getString("kraj_kod")); - } catch (Exception e) { + mKatastrOkres = katastr.getString("okres", null); + + try { + mKatastrKrajKod = Long.parseLong(katastr.getString("kraj_kod", null)); + } catch (NumberFormatException e) { Logging.log(Level.WARNING, "katastr.kraj_kod:", e); } - try { - m_katastr_kraj = katastr.getString("kraj"); - } catch (Exception e) { - Logging.log(Level.WARNING, "katastr.kraj:", e); - } - - } catch (Exception e) { + mKatastrKraj = katastr.getString("kraj", null); + + } catch (IllegalArgumentException e) { Logging.log(Level.WARNING, "katastr:", e); } @@ -636,139 +503,151 @@ public String getHtml() { - String icon_ext_link = "\"Zobrazit"; - String icon_ext_link_ruian = "\"Zobrazit"; - String icon_ext_link_kn = "\"Zobrazit"; - String icon_copy_tags = "\"Kopírovat"; - String icon_create_addr = "\"Vytvořit"; - String icon_create_addr_ruian = "\"Vytvořit"; - String icon_ruian_error = "\"Nahlásit"; // CHECKSTYLE.OFF: LineLength - String url_cpost = "http://www.postaonline.cz/vyhledani-psc?p_p_id=psc_WAR_pcpvpp&p_p_lifecycle=1&p_p_state=normal&p_p_mode=view&p_p_col_id=column-1&p_p_col_count=1&_psc_WAR_pcpvpp_struts.portlet.action=%2Fview%2FdetailPost&_psc_WAR_pcpvpp_struts.portlet.mode=view&_psc_WAR_pcpvpp_zipCode="; + String urlCpost = "https://www.postaonline.cz/vyhledani-psc?p_p_id=psc_WAR_pcpvpp&p_p_lifecycle=1&p_p_state=normal&p_p_mode=view&p_p_col_id=column-1&p_p_col_count=1&_psc_WAR_pcpvpp_struts.portlet.action=%2Fview%2FdetailPost&_psc_WAR_pcpvpp_struts.portlet.mode=view&_psc_WAR_pcpvpp_zipCode="; // CHECKSTYLE.ON: LineLength - String url_stavebni_objekt = "http://vdp.cuzk.cz/vdp/ruian/stavebniobjekty/"; - String url_adresni_misto = "http://vdp.cuzk.cz/vdp/ruian/adresnimista/"; - String url_parcela = "http://vdp.cuzk.cz/vdp/ruian/parcely/"; - String url_katastralni_uzemi = "http://vdp.cuzk.cz/vdp/ruian/katastralniuzemi/"; - String url_ulice = "http://vdp.cuzk.cz/vdp/ruian/ulice/"; - String url_mistni_cast = "http://vdp.cuzk.cz/vdp/ruian/castiobce/"; - String url_mestska_cast = "http://vdp.cuzk.cz/vdp/ruian/mestskecasti/"; - String url_obec = "http://vdp.cuzk.cz/vdp/ruian/obce/"; - String url_okres = "http://vdp.cuzk.cz/vdp/ruian/okresy/"; - String url_kraj = "http://vdp.cuzk.cz/vdp/ruian/vusc/"; - String url_vlastnici = "http://vdp.cuzk.cz/vdp/ruian/vlastnici?typ="; - - String url_ruian_error = "http://ruian.poloha.net/building.php?kod="; + String urlStavebniObjekt = "https://vdp.cuzk.cz/vdp/ruian/stavebniobjekty/"; + String urlAdresniMisto = "https://vdp.cuzk.cz/vdp/ruian/adresnimista/"; + String urlParcela = "https://vdp.cuzk.cz/vdp/ruian/parcely/"; + String urlKatastralniUzemi = "https://vdp.cuzk.cz/vdp/ruian/katastralniuzemi/"; + String urlUlice = "https://vdp.cuzk.cz/vdp/ruian/ulice/"; + String urlMistniCast = "https://vdp.cuzk.cz/vdp/ruian/castiobce/"; + String urlMestskaCast = "https://vdp.cuzk.cz/vdp/ruian/mestskecasti/"; + String urlObec = "https://vdp.cuzk.cz/vdp/ruian/obce/"; + String urlOkres = "https://vdp.cuzk.cz/vdp/ruian/okresy/"; + String urlKraj = "https://vdp.cuzk.cz/vdp/ruian/vusc/"; + String urlVlastnici = "https://vdp.cuzk.cz/vdp/ruian/vlastnici?typ="; + + String urlRuianError = "http://ruian.poloha.net/building.php?kod="; StringBuilder r = new StringBuilder(); - if (m_objekt_ruian_id == 0 && - m_parcela_ruian_id == 0 && - m_adresni_mista.size() == 0 && - m_ulice_ruian_id == 0 && - m_katastr_ruian_id == 0) + if (mObjektRuianId == 0 && + mParcelaRuianId == 0 && + mAdresniMista.isEmpty() && + mUliceRuianId == 0 && + mKatastrRuianId == 0) return ""; r.append("
"); r.append("
"); - if (m_objekt_ruian_id > 0) { - r.append("Informace o budově
") - .append("RUIAN id: "+ m_objekt_ruian_id +"  " - + icon_ext_link_ruian + "") - .append("  "+ icon_ext_link_kn +"") - .append("  "+ icon_copy_tags +"") - .append("  "+ icon_ruian_error +"
"); - if (m_adresni_mista.size() == 0) r.append("Budova: bez č.p./č.e
"); - else if (m_adresni_mista.get(0).getCisloTyp().equals("Číslo popisné")) r.append("Budova: s číslem popisným
"); + if (mObjektRuianId > 0) { + r.append("Informace o budově
").append("RUIAN id: ") + .append(mObjektRuianId).append("  ").append(iconExtLinkRuian).append("") + .append("  ").append(iconExtLinkKn).append("") + .append("  ").append(iconCopyTags).append("") + .append("  ") + .append(iconRuianError).append("
"); + if (mAdresniMista.isEmpty()) r.append("Budova: bez č.p./č.e
"); + else if ("Číslo popisné".equals(mAdresniMista.get(0).getCisloTyp())) r.append("Budova: s číslem popisným
"); else r.append("Budova: s číslem evidenčním
"); - if (m_objekt_podlazi > 0) r.append("Počet podlaží: " + m_objekt_podlazi + "
"); - if (m_objekt_byty > 0) r.append("Počet bytů: " + m_objekt_byty + "
"); - r.append("Způsob využití: " + m_objekt_zpusob_vyuziti + "
") - .append("Datum dokončení: " + m_objekt_dokonceni + "
") - .append("Platí od: " + m_objekt_plati_od + "
"); - - if (m_adresni_mista.size() > 1) { + if (mObjektPodlazi > 0) r.append("Počet podlaží: ").append(mObjektPodlazi).append("
"); + if (mObjektByty > 0) r.append("Počet bytů: ").append(mObjektByty).append("
"); + r.append("Způsob využití: ").append(mObjektZpusobVyuziti).append("
") + .append("Datum dokončení: ").append(mObjektDokonceni).append("
") + .append("Platí od: ").append(mObjektPlatiOd).append("
"); + + if (mAdresniMista.size() > 1) { r.append("Informace o adrese
"); // More address places int i = 0; - r.append("
") - .append("" + m_adresni_mista.get(i).getCisloTyp() + " (více adres): " - + m_adresni_mista.get(i).getCisloDomovni() + "
") - .append("Část obce: " + m_adresni_mista.get(i).getCastObce()) - .append("  " + icon_ext_link_ruian + "
"); - if (m_adresni_mista.get(i).getMestskaCast().length() > 0) { - r.append("Městská část: " + m_adresni_mista.get(i).getMestskaCast()) - .append("  " - + icon_ext_link_ruian + "
"); - } - r.append("Obec: " + m_adresni_mista.get(i).getObec()) - .append("  " + icon_ext_link_ruian + "
") - .append("Okres: " + m_adresni_mista.get(i).getOkres()) - .append("  " + icon_ext_link_ruian + "
") - .append("Kraj: " + m_adresni_mista.get(i).getKraj()) - .append("  " + icon_ext_link_ruian + "
"); - - } else if (m_adresni_mista.size() == 1 - && (m_adresni_mista.get(0).getCisloDomovni() == null || m_adresni_mista.get(0).getCisloDomovni().isEmpty())) { + r.append("
").append("").append(mAdresniMista.get(i).getCisloTyp()) + .append(" (více adres): ").append(mAdresniMista.get(i).getCisloDomovni()) + .append("
").append("Část obce: ").append(mAdresniMista.get(i).getCastObce()) + .append("  ").append(iconExtLinkRuian).append("
"); + if (!mAdresniMista.get(i).getMestskaCast().isEmpty()) { + r.append("Městská část: ").append(mAdresniMista.get(i).getMestskaCast()) + .append("  ") + .append(iconExtLinkRuian).append("
"); + } + r.append("Obec: ").append(mAdresniMista.get(i).getObec()).append("  ") + .append(iconExtLinkRuian).append("
").append("Okres: ") + .append(mAdresniMista.get(i).getOkres()).append("  ") + .append(iconExtLinkRuian).append("
").append("Kraj: ") + .append(mAdresniMista.get(i).getKraj()).append("  ") + .append(iconExtLinkRuian).append("
"); + + } else if (mAdresniMista.size() == 1 + && (mAdresniMista.get(0).getCisloDomovni() == null || mAdresniMista.get(0).getCisloDomovni().isEmpty())) { // Without building number int i = 0; - r.append("
") - .append("Informace o adrese
") - .append("Budova: " + m_adresni_mista.get(i).getCisloTyp() + "
"); - if (m_adresni_mista.get(i).getMestskaCast().length() > 0) { - r.append("Městská část: " + m_adresni_mista.get(i).getMestskaCast()) - .append("  " - + icon_ext_link_ruian + "
"); - } - r.append("Obec: " + m_adresni_mista.get(i).getObec()) - .append("  " + icon_ext_link_ruian + "
") - .append("Okres: " + m_adresni_mista.get(i).getOkres()) - .append("  " + icon_ext_link_ruian + "
") - .append("Kraj: " + m_adresni_mista.get(i).getKraj()) - .append("  " + icon_ext_link_ruian + "
"); - - } else if (m_adresni_mista.size() == 1) { + r.append("
").append("Informace o adrese
").append("Budova: ") + .append(mAdresniMista.get(i).getCisloTyp()).append("
"); + if (mAdresniMista.get(i).getMestskaCast().length() > 0) { + r.append("Městská část: ").append(mAdresniMista.get(i).getMestskaCast()) + .append("  ").append(iconExtLinkRuian) + .append("
"); + } + r.append("Obec: ").append(mAdresniMista.get(i).getObec()).append("  ").append(iconExtLinkRuian) + .append("
").append("Okres: ").append(mAdresniMista.get(i).getOkres()) + .append("  ").append(iconExtLinkRuian).append("
").append("Kraj: ") + .append(mAdresniMista.get(i).getKraj()).append("  ").append(iconExtLinkRuian).append("
"); + + } else if (mAdresniMista.size() == 1) { // Only one address place int i = 0; String x = ""; - String x_name = ""; - if (!m_adresni_mista.get(i).getCisloOrientacni().isEmpty()) { - x = "/" + m_adresni_mista.get(i).getCisloOrientacni(); - x_name = "/orientační"; + String xName = ""; + if (!mAdresniMista.get(i).getCisloOrientacni().isEmpty()) { + x = "/" + mAdresniMista.get(i).getCisloOrientacni(); + xName = "/orientační"; } r.append("
") - .append("Informace o adrese
") - .append("RUIAN id: "+ m_adresni_mista.get(i).getRuianID() +"  " + icon_ext_link_ruian + "") - .append("  "+ icon_copy_tags +"") - .append("  "+ icon_create_addr +"") - .append("  "+ icon_create_addr_ruian +"
") - .append("" + m_adresni_mista.get(i).getCisloTyp() + x_name + ": " + m_adresni_mista.get(i).getCisloDomovni() + x) + .append("Informace o adrese
").append("RUIAN id: ") + .append(mAdresniMista.get(i).getRuianID()).append("  ").append(iconExtLinkRuian).append("") + .append("  ").append(iconCopyTags) + .append("").append("  ") + .append(iconCreateAddr).append("").append("  ").append(iconCreateAddrRuian).append("
").append("") + .append(mAdresniMista.get(i).getCisloTyp()).append(xName).append(": ") + .append(mAdresniMista.get(i).getCisloDomovni()).append(x) .append("
"); - if (!m_adresni_mista.get(i).getUlice().isEmpty()) { - r.append("Ulice: " + m_adresni_mista.get(i).getUlice()) - .append("  " + icon_ext_link_ruian + "
"); - } - r.append("Část obce: " + m_adresni_mista.get(i).getCastObce()) - .append("  " + icon_ext_link_ruian + "
"); - if (m_adresni_mista.get(i).getMestskaCast().length() > 0) { - r.append("Městská část: " + m_adresni_mista.get(i).getMestskaCast()) - .append("  " - + icon_ext_link_ruian + "
"); - } - r.append("Obec: " + m_adresni_mista.get(i).getObec()) - .append("  " + icon_ext_link_ruian + "
") - .append("Okres: " + m_adresni_mista.get(i).getOkres()) - .append("  " + icon_ext_link_ruian + "
") - .append("Kraj: " + m_adresni_mista.get(i).getKraj()) - .append("  " + icon_ext_link_ruian + "
") - .append("PSČ: " + m_adresni_mista.get(i).getPsc()) - .append("  " + icon_ext_link_ruian + "
"); + if (!mAdresniMista.get(i).getUlice().isEmpty()) { + r.append("Ulice: ").append(mAdresniMista.get(i).getUlice()).append("  ").append(iconExtLinkRuian) + .append("
"); + } + r.append("Část obce: ").append(mAdresniMista.get(i).getCastObce()).append("  ").append(iconExtLinkRuian) + .append("
"); + if (mAdresniMista.get(i).getMestskaCast().length() > 0) { + r.append("Městská část: ").append(mAdresniMista.get(i).getMestskaCast()).append("  ") + .append(iconExtLinkRuian).append("
"); + } + r.append("Obec: ").append(mAdresniMista.get(i).getObec()).append("  ").append(iconExtLinkRuian) + .append("
").append("Okres: ").append(mAdresniMista.get(i).getOkres()) + .append("  ").append(iconExtLinkRuian).append("
").append("Kraj: ") + .append(mAdresniMista.get(i).getKraj()).append("  ").append(iconExtLinkRuian).append("
") + .append("PSČ: ").append(mAdresniMista.get(i).getPsc()).append("  ").append(iconExtLinkRuian).append("
"); } @@ -777,15 +656,13 @@ // Reported errors - if (m_objekt_ruian_id > 0 && !m_err_user.isEmpty()) { - r.append("Nahlášený problém") - .append("  "+ icon_ext_link +"
") - .append("Nahlásil: " + m_err_user) - .append("
") - .append("Dne: " + m_err_date) - .append("
") - .append("Typ problému: " + m_err_type) + if (mObjektRuianId > 0 && !mErrUser.isEmpty()) { + r.append("Nahlášený problém").append("  ").append(iconExtLink).append("
") + .append("Nahlásil: ").append(mErrUser) + .append("
").append("Dne: ").append(mErrDate) + .append("
").append("Typ problému: ").append(mErrType) .append("
"); - if (!m_err_note.isEmpty()) { - r.append("Poznámka: " + m_err_note) + if (!mErrNote.isEmpty()) { + r.append("Poznámka: ").append(mErrNote) .append("
"); } @@ -794,19 +671,22 @@ // Address places - if (m_adresni_mista.size() > 1 && m_objekt_ruian_id > 0) { + if (mAdresniMista.size() > 1 && mObjektRuianId > 0) { String x = ""; - if (m_adresni_mista.get(0).getCisloTyp().equals("Číslo evidenční")) { + if ("Číslo evidenční".equals(mAdresniMista.get(0).getCisloTyp())) { x = "ev."; } r.append("Adresní místa
"); - for (int i = 0; i < m_adresni_mista.size(); i++) { - r.append(m_adresni_mista.get(i).getUlice() + " " + x + m_adresni_mista.get(i).getCisloDomovni()); - if (!m_adresni_mista.get(i).getCisloOrientacni().isEmpty()) { - r.append("/" + m_adresni_mista.get(i).getCisloOrientacni()); - } - r.append("  "+ icon_ext_link_ruian +" ") - .append("  "+ icon_copy_tags +"") - .append("  "+ icon_create_addr +"") - .append("  "+ icon_create_addr_ruian +"") + for (int i = 0; i < mAdresniMista.size(); i++) { + r.append(mAdresniMista.get(i).getUlice()).append(" ").append(x).append(mAdresniMista.get(i).getCisloDomovni()); + if (!mAdresniMista.get(i).getCisloOrientacni().isEmpty()) { + r.append("/").append(mAdresniMista.get(i).getCisloOrientacni()); + } + r.append("  ").append(iconExtLinkRuian).append(" ") + .append("  ") + .append(iconCopyTags).append("").append("  ").append(iconCreateAddr).append("") + .append("  ") + .append(iconCreateAddrRuian).append("") .append("
"); } @@ -815,76 +695,76 @@ // Land - if (m_parcela_ruian_id > 0) { + if (mParcelaRuianId > 0) { + // .append("  "+ icon_copy_tags +"") r.append("Informace o pozemku") - .append("
") - .append("RUIAN id: "+ m_parcela_ruian_id +"  " - + icon_ext_link_ruian + "") - .append("  "+ icon_ext_link_kn +"
") - // .append("  "+ icon_copy_tags +"") - .append("Druh pozemku: " + m_parcela_druh_pozemku +"
"); - if (m_parcela_zpusob_vyuziti != "") r.append("Způsob využití: " + m_parcela_zpusob_vyuziti +"
"); - r.append("Platí od: " + m_parcela_plati_od +"
") + .append("
").append("RUIAN id: ").append(mParcelaRuianId).append("  ").append(iconExtLinkRuian).append("") + .append("  ").append(iconExtLinkKn).append("
").append("Druh pozemku: ") + .append(mParcelaDruhPozemku).append("
"); + if (!"".equals(mParcelaZpusobVyuziti)) r.append("Způsob využití: ").append(mParcelaZpusobVyuziti).append("
"); + r.append("Platí od: ").append(mParcelaPlatiOd).append("
") .append("
"); } // Street - if (m_ulice_ruian_id > 0) { - r.append("Informace o ulici
") - .append("RUIAN id: "+ m_ulice_ruian_id +"  " + icon_ext_link_ruian + "") - .append("  "+ icon_copy_tags +"
") - .append("Jméno: " + m_ulice_jmeno +"
") + if (mUliceRuianId > 0) { + r.append("Informace o ulici
").append("RUIAN id: ").append(mUliceRuianId) + .append("  ") + .append(iconExtLinkRuian).append("").append("  ") + .append(iconCopyTags).append("
").append("Jméno: ").append(mUliceJmeno).append("
") .append("
"); } // Cadastral area - if (m_katastr_ruian_id > 0) { - r.append("Katastrální území: " + m_katastr_nazev) - .append("  " + icon_ext_link_ruian + "
") - .append("Obec: " + m_katastr_obec) - .append("  " + icon_ext_link_ruian + "
") - .append("Okres: " + m_katastr_okres) - .append("  " + icon_ext_link_ruian + "
") - .append("Kraj: " + m_katastr_kraj) - .append("  " + icon_ext_link_ruian + "
") + if (mKatastrRuianId > 0) { + r.append("Katastrální území: ").append(mKatastrNazev).append("  ").append(iconExtLinkRuian) + .append("
").append("Obec: ").append(mKatastrObec).append("  ").append(iconExtLinkRuian).append("
") + .append("Okres: ").append(mKatastrOkres).append("  ").append(iconExtLinkRuian).append("
") + .append("Kraj: ").append(mKatastrKraj).append("  ").append(iconExtLinkRuian).append("
") .append("
"); } // Near address places - if (!m_adresni_mista.isEmpty() && m_objekt_ruian_id == 0) { - String x; + if (!mAdresniMista.isEmpty() && mObjektRuianId == 0) { r.append("Adresní místa v okolí
") .append(""); - for (int i = 0; i < m_adresni_mista.size(); i++) { - x = ""; - if (m_adresni_mista.get(i).getCisloTyp().equals("Číslo evidenční")) { - x = "ev."; - } - x += m_adresni_mista.get(i).getCisloDomovni(); - if (!m_adresni_mista.get(i).getCisloOrientacni().isEmpty()) { - x += "/" + m_adresni_mista.get(i).getCisloOrientacni(); + for (int i = 0; i < mAdresniMista.size(); i++) { + StringBuilder x = new StringBuilder(); + if ("Číslo evidenční".equals(mAdresniMista.get(i).getCisloTyp())) { + x.append("ev."); + } + x.append(mAdresniMista.get(i).getCisloDomovni()); + if (!mAdresniMista.get(i).getCisloOrientacni().isEmpty()) { + x.append("/").append(mAdresniMista.get(i).getCisloOrientacni()); } r.append(""); @@ -893,18 +773,18 @@ } - if (!m_so_bez_geometrie.isEmpty()) { + if (!mSoBezGeometrie.isEmpty()) { r.append("Budovy bez geometrie v okolí
") .append("
"); - if (!m_adresni_mista.get(i).getUlice().isEmpty()) { - r.append(m_adresni_mista.get(i).getVzdalenost()) - .append("") - .append(m_adresni_mista.get(i).getUlice() + " " + x) - .append("
" + m_adresni_mista.get(i).getObec() + "") - .append("		") - .append(""+ icon_ext_link_ruian +"") - .append("  "+ icon_copy_tags +"") - .append("  "+ icon_create_addr +"") - .append("  "+ icon_create_addr_ruian +""); + if (!mAdresniMista.get(i).getUlice().isEmpty()) { + r.append(mAdresniMista.get(i).getVzdalenost()) + .append("").append(mAdresniMista.get(i).getUlice()) + .append(" ").append(x).append("
").append(mAdresniMista.get(i).getObec()).append("") + .append("		").append("").append(iconExtLinkRuian).append("") + .append("  ").append(iconCopyTags) + .append("").append("  ") + .append(iconCreateAddr).append("").append("  ").append(iconCreateAddrRuian).append(""); } else { - r.append(m_adresni_mista.get(i).getVzdalenost()) - .append("") - .append(m_adresni_mista.get(i).getCastObce() + " " + x + " "); - if (!m_adresni_mista.get(i).getCastObce().equals(m_adresni_mista.get(i).getObec())) { - r.append("
" + m_adresni_mista.get(i).getObec() + ""); + r.append(mAdresniMista.get(i).getVzdalenost()) + .append("		").append(mAdresniMista.get(i).getCastObce()) + .append(" ").append(x).append(" "); + if (!mAdresniMista.get(i).getCastObce().equals(mAdresniMista.get(i).getObec())) { + r.append("
").append(mAdresniMista.get(i).getObec()).append(""); } - r.append("		") - .append(""+ icon_ext_link_ruian +"") - .append("  "+ icon_copy_tags +"") - .append("  "+ icon_create_addr +"") - .append("  "+ icon_create_addr_ruian +""); + r.append("").append("").append(iconExtLinkRuian).append("") + .append("  ").append(iconCopyTags) + .append("").append("  ") + .append(iconCreateAddr).append("").append("  ").append(iconCreateAddrRuian).append(""); } r.append("
"); - for (int i = 0; i < m_so_bez_geometrie.size(); i++) { + for (int i = 0; i < mSoBezGeometrie.size(); i++) { r.append(""); } @@ -913,6 +793,6 @@ } - r.append("
") - .append("
Zdroj: " + m_source + "
") + r.append("
").append("
Zdroj: ").append(mSource) + .append("
") .append("
") - .append(m_so_bez_geometrie.get(i).getVzdalenost()) + .append(mSoBezGeometrie.get(i).getVzdalenost()) .append("") - .append(m_so_bez_geometrie.get(i).getRuianID()); - if (m_so_bez_geometrie.get(i).getZpusobVyuziti().length() > 0) { - r.append(" - " + m_so_bez_geometrie.get(i).getZpusobVyuziti()); - } - r.append("") - .append("  "+ icon_ext_link_ruian +" ") - .append("  "+ icon_copy_tags +"
") + .append(mSoBezGeometrie.get(i).getRuianID()); + if (mSoBezGeometrie.get(i).getZpusobVyuziti().length() > 0) { + r.append(" - ").append(mSoBezGeometrie.get(i).getZpusobVyuziti()); + } + r.append("		").append("  ").append(iconExtLinkRuian).append(" ") + .append("  ").append(iconCopyTags).append("
") .append("
"); @@ -926,5 +806,4 @@ */ String convertDate(String ruianDate) { - String r = new String(); String[] parts = ruianDate.split("\\."); try { @@ -932,10 +811,10 @@ int month = Integer.parseInt(parts[1]); int year = Integer.parseInt(parts[2]); - r = Integer.toString(year) + "-" + String.format("%02d", month) + "-" + String.format("%02d", day); - } catch (Exception e) { + return year + "-" + String.format("%02d", month) + "-" + String.format("%02d", day); + } catch (NumberFormatException | IllegalFormatException e) { Logging.warn(e); } - return r; + return ""; } @@ -959,48 +838,48 @@ // Copy building tags to clipboard - if (keyType.equals("building") && m_objekt_ruian_id > 0) { - c.append(tagToString("ref:ruian:building", Long.toString(m_objekt_ruian_id))); - if (!m_objekt_zpusob_vyuziti_key.isEmpty() && - !m_objekt_zpusob_vyuziti_val.isEmpty() + if ("building".equals(keyType) && mObjektRuianId > 0) { + c.append(tagToString("ref:ruian:building", Long.toString(mObjektRuianId))); + if (!mObjektZpusobVyuzitiKey.isEmpty() && + !mObjektZpusobVyuzitiVal.isEmpty() ) { - c.append(tagToString(m_objekt_zpusob_vyuziti_key, m_objekt_zpusob_vyuziti_val)); - } - if (m_objekt_podlazi > 0) { - c.append(tagToString("building:levels", Integer.toString(m_objekt_podlazi))); - } - if (m_objekt_byty > 0) { - c.append(tagToString("building:flats", Integer.toString(m_objekt_byty))); - } - 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(mObjektZpusobVyuzitiKey, mObjektZpusobVyuzitiVal)); + } + if (mObjektPodlazi > 0) { + c.append(tagToString("building:levels", Integer.toString(mObjektPodlazi))); + } + if (mObjektByty > 0) { + c.append(tagToString("building:flats", Integer.toString(mObjektByty))); + } + if (mObjektDokonceni.length() > 0 && convertDate(mObjektDokonceni).length() > 0) { + c.append(tagToString("start_date", convertDate(mObjektDokonceni))); + } + if (mObjektZpusobVyuzitiKod.length() > 0) { + c.append(tagToString("building:ruian:type", mObjektZpusobVyuzitiKod)); } c.append(tagToString("source", "cuzk:ruian")); } - if (keyType.startsWith("ghost") && !m_so_bez_geometrie.isEmpty()) { + if (keyType.startsWith("ghost") && !mSoBezGeometrie.isEmpty()) { String[] key = keyType.split(":"); int i = Integer.parseInt(key[1]); - System.out.println("Ghost ID: " + i); - - c.append(tagToString("ref:ruian:building", Long.toString(m_so_bez_geometrie.get(i).getRuianID()))); - if (m_so_bez_geometrie.get(i).getZpusobVyuzitiKey().length() > 0 && - m_so_bez_geometrie.get(i).getZpusobVyuzitiVal().length() > 0 + Logging.trace("Ghost ID: {0}", i); + + c.append(tagToString("ref:ruian:building", Long.toString(mSoBezGeometrie.get(i).getRuianID()))); + if (mSoBezGeometrie.get(i).getZpusobVyuzitiKey().length() > 0 && + mSoBezGeometrie.get(i).getZpusobVyuzitiVal().length() > 0 ) { - c.append(tagToString(m_so_bez_geometrie.get(i).getZpusobVyuzitiKey(), m_so_bez_geometrie.get(i).getZpusobVyuzitiVal())); - } - if (m_so_bez_geometrie.get(i).getPodlazi() > 0) { - c.append(tagToString("building:levels", Integer.toString(m_so_bez_geometrie.get(i).getPodlazi()))); - } - if (m_so_bez_geometrie.get(i).getByty() > 0) { - c.append(tagToString("building:flats", Integer.toString(m_so_bez_geometrie.get(i).getByty()))); - } - if (m_so_bez_geometrie.get(i).getDokonceni().length() > 0 && convertDate(m_so_bez_geometrie.get(i).getDokonceni()).length() > 0) { - c.append(tagToString("start_date", convertDate(m_so_bez_geometrie.get(i).getDokonceni()))); - } - if (m_so_bez_geometrie.get(i).getZpusobVyuzitiKod().length() > 0) { - c.append(tagToString("building:ruian:type", m_so_bez_geometrie.get(i).getZpusobVyuzitiKod())); + c.append(tagToString(mSoBezGeometrie.get(i).getZpusobVyuzitiKey(), mSoBezGeometrie.get(i).getZpusobVyuzitiVal())); + } + if (mSoBezGeometrie.get(i).getPodlazi() > 0) { + c.append(tagToString("building:levels", Integer.toString(mSoBezGeometrie.get(i).getPodlazi()))); + } + if (mSoBezGeometrie.get(i).getByty() > 0) { + c.append(tagToString("building:flats", Integer.toString(mSoBezGeometrie.get(i).getByty()))); + } + if (mSoBezGeometrie.get(i).getDokonceni().length() > 0 && convertDate(mSoBezGeometrie.get(i).getDokonceni()).length() > 0) { + c.append(tagToString("start_date", convertDate(mSoBezGeometrie.get(i).getDokonceni()))); + } + if (mSoBezGeometrie.get(i).getZpusobVyuzitiKod().length() > 0) { + c.append(tagToString("building:ruian:type", mSoBezGeometrie.get(i).getZpusobVyuzitiKod())); } c.append(tagToString("source", "cuzk:ruian")); @@ -1008,76 +887,70 @@ // Copy address tags to clipboard - if (keyType.startsWith("address")) { - if (!m_adresni_mista.isEmpty()) { - int i; - - if (m_adresni_mista.isEmpty()) { - i = 0; - } else { - String[] key = keyType.split(":"); - i = Integer.valueOf(key[1]); - Logging.info("Address ID: " + i); - } - - // Only one address place - if (!m_adresni_mista.get(i).getCisloTyp().equals("Číslo evidenční")) { - // Cislo popisne - c.append(tagToString("addr:conscriptionnumber", m_adresni_mista.get(i).getCisloDomovni())); - } else { - // Cislo evidencni - c.append(tagToString("addr:provisionalnumber", m_adresni_mista.get(i).getCisloDomovni())); - } - - // Cislo orientacni - if (!m_adresni_mista.get(i).getCisloOrientacni().isEmpty()) { - c.append(tagToString("addr:streetnumber", m_adresni_mista.get(i).getCisloOrientacni())); - } - - // Domovni cislo - StringBuilder addr = new StringBuilder(); - if (!m_adresni_mista.get(i).getCisloTyp().equals("Číslo evidenční")) { - addr.append(m_adresni_mista.get(i).getCisloDomovni()); - } else { - addr.append("ev." + m_adresni_mista.get(i).getCisloDomovni()); - } - if (!m_adresni_mista.get(i).getCisloOrientacni().isEmpty()) { - addr.append("/" + m_adresni_mista.get(i).getCisloOrientacni()); - } - c.append(tagToString("addr:housenumber", addr.toString())); - - // Street - if (!m_adresni_mista.get(i).getUlice().isEmpty()) { - c.append(tagToString("addr:street", m_adresni_mista.get(i).getUlice())); - } - //RUIAN ID - if (m_adresni_mista.get(i).getRuianID() > 0) { - c.append(tagToString("ref:ruian:addr", Long.toString(m_adresni_mista.get(i).getRuianID()))); - } - - // Place - if (!m_adresni_mista.get(i).getCastObce().isEmpty()) { - c.append(tagToString("addr:place", m_adresni_mista.get(i).getCastObce())); - } - - if (!m_adresni_mista.get(i).getMestskaCast().isEmpty()) { - c.append(tagToString("addr:suburb", m_adresni_mista.get(i).getMestskaCast())); - } - - // City - if (!m_adresni_mista.get(i).getObec().isEmpty()) { - c.append(tagToString("addr:city", m_adresni_mista.get(i).getObec())); - } - - // Postcode - if (!m_adresni_mista.get(i).getPsc().isEmpty()) { - c.append(tagToString("addr:postcode", m_adresni_mista.get(i).getPsc())); - } - - // Country - c.append(tagToString("addr:country", "CZ")); - - // Source - c.append(tagToString("source:addr", "cuzk:ruian")); - } + if (keyType.startsWith("address") && !mAdresniMista.isEmpty()) { + int i; + + String[] key = keyType.split(":"); + i = Integer.parseInt(key[1]); + Logging.info("Address ID: " + i); + + // Only one address place + if (!"Číslo evidenční".equals(mAdresniMista.get(i).getCisloTyp())) { + // Cislo popisne + c.append(tagToString("addr:conscriptionnumber", mAdresniMista.get(i).getCisloDomovni())); + } else { + // Cislo evidencni + c.append(tagToString("addr:provisionalnumber", mAdresniMista.get(i).getCisloDomovni())); + } + + // Cislo orientacni + if (!mAdresniMista.get(i).getCisloOrientacni().isEmpty()) { + c.append(tagToString("addr:streetnumber", mAdresniMista.get(i).getCisloOrientacni())); + } + + // Domovni cislo + StringBuilder addr = new StringBuilder(); + if (!"Číslo evidenční".equals(mAdresniMista.get(i).getCisloTyp())) { + addr.append(mAdresniMista.get(i).getCisloDomovni()); + } else { + addr.append("ev.").append(mAdresniMista.get(i).getCisloDomovni()); + } + if (!mAdresniMista.get(i).getCisloOrientacni().isEmpty()) { + addr.append("/").append(mAdresniMista.get(i).getCisloOrientacni()); + } + c.append(tagToString("addr:housenumber", addr.toString())); + + // Street + if (!mAdresniMista.get(i).getUlice().isEmpty()) { + c.append(tagToString("addr:street", mAdresniMista.get(i).getUlice())); + } + //RUIAN ID + if (mAdresniMista.get(i).getRuianID() > 0) { + c.append(tagToString("ref:ruian:addr", Long.toString(mAdresniMista.get(i).getRuianID()))); + } + + // Place + if (!mAdresniMista.get(i).getCastObce().isEmpty()) { + c.append(tagToString("addr:place", mAdresniMista.get(i).getCastObce())); + } + + if (!mAdresniMista.get(i).getMestskaCast().isEmpty()) { + c.append(tagToString("addr:suburb", mAdresniMista.get(i).getMestskaCast())); + } + + // City + if (!mAdresniMista.get(i).getObec().isEmpty()) { + c.append(tagToString("addr:city", mAdresniMista.get(i).getObec())); + } + + // Postcode + if (!mAdresniMista.get(i).getPsc().isEmpty()) { + c.append(tagToString("addr:postcode", mAdresniMista.get(i).getPsc())); + } + + // Country + c.append(tagToString("addr:country", "CZ")); + + // Source + c.append(tagToString("source:addr", "cuzk:ruian")); } @@ -1085,7 +958,7 @@ // Copy street tags to clipboard - if (keyType.equals("street") && m_ulice_ruian_id > 0) { - c.append(tagToString("ref:ruian:street", Long.toString(m_ulice_ruian_id))); - c.append(tagToString("name", m_ulice_jmeno)); + if ("street".equals(keyType) && mUliceRuianId > 0) { + c.append(tagToString("ref:ruian:street", Long.toString(mUliceRuianId))); + c.append(tagToString("name", mUliceJmeno)); c.append(tagToString("source", "cuzk:ruian")); } @@ -1105,7 +978,7 @@ String[] key = cmd.split(":"); int i = Integer.parseInt(key[1]); - node = new Node(m_adresni_mista.get(i).getPosition()); + node = new Node(mAdresniMista.get(i).getPosition()); } else { - node = new Node(new LatLon(m_coor_lat, m_coor_lon)); + node = new Node(new LatLon(mCoorLat, mCoorLon)); } commands.add(new AddCommand(MainApplication.getLayerManager().getEditDataSet(), node)); @@ -1136,5 +1009,5 @@ Logging.info("act: " + act.substring(7)); String[] params = act.substring(7).split("/"); - if (!params[0].equals("tags.copy") && !params[0].startsWith("tags.create")) { + if (!"tags.copy".equals(params[0]) && !params[0].startsWith("tags.create")) { return; } @@ -1143,17 +1016,13 @@ // Copy tags to clipboard - if (params[0].equals("tags.copy")) { - if (!task.isEmpty()) { - ClipboardUtils.copyString(task); - PointInfoUtils.showNotification(tr("Tags copied to clipboard."), "info"); - } + if ("tags.copy".equals(params[0]) && !task.isEmpty()) { + ClipboardUtils.copyString(task); + PointInfoUtils.showNotification(tr("Tags copied to clipboard."), "info"); } // Create address node - if (params[0].startsWith("tags.create")) { - if (!task.isEmpty()) { - createAddrPoint(act.substring(7), task); - PointInfoUtils.showNotification(tr("New address point added."), "info"); - } + if (params[0].startsWith("tags.create") && !task.isEmpty()) { + createAddrPoint(act.substring(7), task); + PointInfoUtils.showNotification(tr("New address point added."), "info"); } }