Changeset 33245 in osm


Ignore:
Timestamp:
2017-04-15T17:08:27+02:00 (7 years ago)
Author:
donvip
Message:

update to JOSM 11919

Location:
applications/editors/josm/plugins/opendata
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/opendata/build.xml

    r33197 r33245  
    11<?xml version="1.0" encoding="utf-8"?>
    22<project name="opendata" default="dist" basedir=".">
    3     <property name="plugin.main.version" value="11772"/>
     3    <property name="plugin.main.version" value="11919"/>
    44    <property name="plugin.author" value="Don-vip"/>
    55    <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/OdConstants.java

    r32898 r33245  
    2929     * Preferences
    3030     */
    31 /*    public static final String PREF_COORDINATES = "opendata.coordinates";
     31    /*    public static final String PREF_COORDINATES = "opendata.coordinates";
    3232    public static final String VALUE_CC9ZONES = "cc9zones";
    3333    public static final String VALUE_WGS84 = "wgs84";*/

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NeptuneReader.java

    r32545 r33245  
    3232import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    3333import org.openstreetmap.josm.io.AbstractReader;
     34import org.openstreetmap.josm.io.IllegalDataException;
    3435import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
    3536import org.openstreetmap.josm.plugins.opendata.core.datasets.fr.FrenchConstants;
    … …  
    112113            }
    113114        } catch (IOException e) {
    114             Main.error(e.getMessage());
     115            Main.error(e);
    115116        }
    116117
    … …  
    118119    }
    119120
    120     public static DataSet parseDataSet(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance) throws JAXBException {
    121         return new NeptuneReader().parse(in, instance);
     121    public static DataSet parseDataSet(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance) throws IllegalDataException {
     122        return new NeptuneReader().doParseDataSet(in, instance);
    122123    }
    123124
    … …  
    243244    }
    244245
    245     private DataSet parse(InputStream in, ProgressMonitor instance) throws JAXBException {
    246         root = unmarshal(ChouettePTNetworkType.class, in);
     246    @Override
     247    protected DataSet doParseDataSet(InputStream in, ProgressMonitor instance) throws IllegalDataException {
     248        try {
     249            root = unmarshal(ChouettePTNetworkType.class, in);
     250        } catch (JAXBException e) {
     251            throw new IllegalDataException(e);
     252        }
    247253
    248254        Relation network = createNetwork(root.getPTNetwork());

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/OverpassApi.java

    r32545 r33245  
    4343    }
    4444
    45     public static final String union(String ... queries) {
     45    public static final String union(String... queries) {
    4646        String result = "<union>\n";
    4747        for (String query : queries) {
    … …  
    5454    }
    5555
    56     public static final String query(String bbox, OaQueryType type, String ... conditions) {
     56    public static final String query(String bbox, OaQueryType type, String... conditions) {
    5757        String result = "<query type=\""+type+"\" >\n";
    5858        if (bbox != null) {
    … …  
    7272    }
    7373
    74     public static final String recurse(OaRecurseType ... types) {
     74    public static final String recurse(OaRecurseType... types) {
    7575        String result = "";
    7676        for (OaRecurseType type : types) {

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/XmlImporter.java

    r30723 r33245  
    77import java.io.InputStream;
    88import java.net.URL;
    9 
    10 import javax.xml.bind.JAXBException;
    119
    1210import org.openstreetmap.josm.actions.ExtensionFileFilter;
    … …  
    2422        super(XML_FILE_FILTER);
    2523    }
    26    
     24
    2725    @Override
    2826    public boolean acceptFile(File pathname) {
    … …  
    4038    protected DataSet parseDataSet(InputStream in, ProgressMonitor instance)
    4139            throws IllegalDataException {
    42         try {
    43             return NeptuneReader.parseDataSet(in, handler, instance);
    44         } catch (JAXBException e) {
    45             throw new IllegalDataException(e);
    46         }
     40        return NeptuneReader.parseDataSet(in, handler, instance);
    4741    }
    4842}

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ArchiveReader.java

    r32545 r33245  
    66import java.io.FileNotFoundException;
    77import java.io.IOException;
     8import java.io.InputStream;
    89import java.util.ArrayList;
    910import java.util.Collection;
    … …  
    1314import java.util.Map;
    1415
    15 import javax.xml.bind.JAXBException;
    1616import javax.xml.stream.FactoryConfigurationError;
    1717import javax.xml.stream.XMLStreamException;
    … …  
    2121import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    2222import org.openstreetmap.josm.io.AbstractReader;
     23import org.openstreetmap.josm.io.IllegalDataException;
    2324import org.openstreetmap.josm.plugins.opendata.OdPlugin;
    2425import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
    … …  
    5758    }
    5859
    59     protected abstract void extractArchive(final File temp, final List<File> candidates) throws IOException, FileNotFoundException;
     60    protected abstract void extractArchive(File temp, List<File> candidates) throws IOException, FileNotFoundException;
    6061
    6162    protected abstract String getTaskMessage();
    … …  
    8687
    8788    public Map<File, DataSet> parseDocs(final ProgressMonitor progressMonitor)
    88             throws IOException, XMLStreamException, FactoryConfigurationError, JAXBException {
     89            throws IOException, XMLStreamException, FactoryConfigurationError, IllegalDataException {
    8990        Map<File, DataSet> result = new HashMap<>();
    9091        File temp = OdUtils.createTempDir();
    … …  
    107108
    108109    public DataSet parseDoc(final ProgressMonitor progressMonitor)
    109             throws IOException, XMLStreamException, FactoryConfigurationError, JAXBException {
     110            throws IOException, XMLStreamException, FactoryConfigurationError, IllegalDataException {
    110111        File temp = OdUtils.createTempDir();
    111112
    … …  
    133134    }
    134135
     136    @Override
     137    protected DataSet doParseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
     138        return null;
     139    }
     140
    135141    protected DataSet getDataForFile(File f, final ProgressMonitor progressMonitor)
    136             throws FileNotFoundException, IOException, XMLStreamException, FactoryConfigurationError, JAXBException {
     142            throws FileNotFoundException, IOException, XMLStreamException, FactoryConfigurationError, IllegalDataException {
    137143        if (f == null) {
    138144            return null;

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/SevenZipReader.java

    r32545 r33245  
    1414import java.util.Map;
    1515
    16 import javax.xml.bind.JAXBException;
    1716import javax.xml.stream.FactoryConfigurationError;
    1817import javax.xml.stream.XMLStreamException;
    … …  
    2726import org.openstreetmap.josm.data.osm.DataSet;
    2827import org.openstreetmap.josm.gui.progress.ProgressMonitor;
     28import org.openstreetmap.josm.io.IllegalDataException;
    2929import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
    3030import org.openstreetmap.josm.plugins.opendata.core.util.OdUtils;
    … …  
    5454
    5555    public static DataSet parseDataSet(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance, boolean promptUser)
    56             throws IOException, XMLStreamException, FactoryConfigurationError, JAXBException {
     56            throws IOException, XMLStreamException, FactoryConfigurationError, IllegalDataException {
    5757        return new SevenZipReader(in, handler, promptUser).parseDoc(instance);
    5858    }
    5959
    6060    public static Map<File, DataSet> parseDataSets(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance, boolean promptUser)
    61             throws IOException, XMLStreamException, FactoryConfigurationError, JAXBException {
     61            throws IOException, XMLStreamException, FactoryConfigurationError, IllegalDataException {
    6262        return new SevenZipReader(in, handler, promptUser).parseDocs(instance);
    6363    }

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipImporter.java

    r30723 r33245  
    55
    66import java.io.File;
     7import java.io.IOException;
    78import java.io.InputStream;
     9
     10import javax.xml.stream.FactoryConfigurationError;
     11import javax.xml.stream.XMLStreamException;
    812
    913import org.openstreetmap.josm.actions.ExtensionFileFilter;
    … …  
    2832        try {
    2933            return ZipReader.parseDataSet(in, handler, instance, true);
    30         } catch (Exception e) {
     34        } catch (IOException | XMLStreamException | FactoryConfigurationError e) {
    3135            throw new IllegalDataException(e);
    3236        }

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipReader.java

    r30738 r33245  
    1414import java.util.zip.ZipInputStream;
    1515
    16 import javax.xml.bind.JAXBException;
    1716import javax.xml.stream.FactoryConfigurationError;
    1817import javax.xml.stream.XMLStreamException;
    … …  
    2120import org.openstreetmap.josm.data.osm.DataSet;
    2221import org.openstreetmap.josm.gui.progress.ProgressMonitor;
     22import org.openstreetmap.josm.io.IllegalDataException;
    2323import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
    2424
    … …  
    3535
    3636    public static DataSet parseDataSet(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance, boolean promptUser)
    37             throws IOException, XMLStreamException, FactoryConfigurationError, JAXBException {
     37            throws IOException, XMLStreamException, FactoryConfigurationError, IllegalDataException {
    3838        return new ZipReader(in, handler, promptUser).parseDoc(instance);
    3939    }
    4040
    4141    public static Map<File, DataSet> parseDataSets(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance, boolean promptUser)
    42             throws IOException, XMLStreamException, FactoryConfigurationError, JAXBException {
     42            throws IOException, XMLStreamException, FactoryConfigurationError, IllegalDataException {
    4343        return new ZipReader(in, handler, promptUser).parseDocs(instance);
    4444    }

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/AbstractMapInfoReader.java

    r32545 r33245  
    55import java.io.File;
    66import java.io.IOException;
     7import java.io.InputStream;
    78import java.nio.charset.Charset;
    89import java.nio.charset.IllegalCharsetNameException;
    … …  
    1314
    1415import org.openstreetmap.josm.Main;
     16import org.openstreetmap.josm.data.osm.DataSet;
     17import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    1518import org.openstreetmap.josm.io.AbstractReader;
     19import org.openstreetmap.josm.io.IllegalDataException;
    1620import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
    1721
    … …  
    3842    protected int numcolumns = -1;
    3943    protected List<String> columns;
     44
     45    @Override
     46    protected DataSet doParseDataSet(InputStream source,
     47            ProgressMonitor progressMonitor) throws IllegalDataException {
     48        return null;
     49    }
    4050
    4151    protected final File getDataFile(File headerFile, String extension) {

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java

    r32545 r33245  
    66import java.awt.Component;
    77import java.awt.GraphicsEnvironment;
     8import java.io.InputStream;
    89import java.util.ArrayList;
    910import java.util.Arrays;
    … …  
    3637import org.openstreetmap.josm.Main;
    3738import org.openstreetmap.josm.data.coor.LatLon;
     39import org.openstreetmap.josm.data.osm.DataSet;
    3840import org.openstreetmap.josm.data.osm.Node;
    3941import org.openstreetmap.josm.data.osm.OsmPrimitive;
    … …  
    4345import org.openstreetmap.josm.data.validation.tests.DuplicateWay;
    4446import org.openstreetmap.josm.gui.ExtendedDialog;
     47import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    4548import org.openstreetmap.josm.io.AbstractReader;
     49import org.openstreetmap.josm.io.IllegalDataException;
    4650import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
    4751import org.openstreetmap.josm.plugins.opendata.core.gui.DialogPrompter;
    … …  
    7983        this.handler = handler;
    8084        this.defaultHandlers = defaultHandlers;
     85    }
     86
     87    @Override
     88    protected DataSet doParseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
     89        return null;
    8190    }
    8291

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReader.java

    r32545 r33245  
    2626import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    2727import org.openstreetmap.josm.io.AbstractReader;
     28import org.openstreetmap.josm.io.IllegalDataException;
    2829import org.openstreetmap.josm.io.UTFInputStreamReader;
    2930import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
    … …  
    6061        XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(ir);
    6162        return new KmlReader(parser).parseDoc();
     63    }
     64
     65    @Override
     66    protected DataSet doParseDataSet(InputStream source,
     67            ProgressMonitor progressMonitor) throws IllegalDataException {
     68        return null;
    6269    }
    6370

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmzReader.java

    r32545 r33245  
    1616import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    1717import org.openstreetmap.josm.io.AbstractReader;
     18import org.openstreetmap.josm.io.IllegalDataException;
    1819
    1920public class KmzReader extends AbstractReader {
    … …  
    2829            throws IOException, XMLStreamException, FactoryConfigurationError {
    2930        return new KmzReader(new ZipInputStream(in)).parseDoc(instance);
     31    }
     32
     33    @Override
     34    protected DataSet doParseDataSet(InputStream source,
     35            ProgressMonitor progressMonitor) throws IllegalDataException {
     36        return null;
    3037    }
    3138

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/SpreadSheetReader.java

    r33049 r33245  
    2525import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    2626import org.openstreetmap.josm.io.AbstractReader;
     27import org.openstreetmap.josm.io.IllegalDataException;
    2728import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
    2829import org.openstreetmap.josm.plugins.opendata.core.gui.ChooserLauncher;
    … …  
    8485        }
    8586        return col;
     87    }
     88
     89    @Override
     90    protected DataSet doParseDataSet(InputStream source,
     91            ProgressMonitor progressMonitor) throws IllegalDataException {
     92        return null;
    8693    }
    8794
Note: See TracChangeset for help on using the changeset viewer.