Changeset 5251 in josm for trunk


Ignore:
Timestamp:
2012-05-28T22:10:47+02:00 (7 years ago)
Author:
bastiK
Message:

applied #7720 - fix for OsmServerBackreferenceReader

Location:
trunk/src/org/openstreetmap/josm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

    r4684 r5251  
    2727    /**
    2828     * This flag shows, that the properties have been changed by the user
    29      * and on upload the object will be send to the server
     29     * and on upload the object will be send to the server.
    3030     */
    3131    protected static final int FLAG_MODIFIED = 1 << 0;
    3232
    3333    /**
    34      * The visible flag indicates, that an object is marked
     34     * This flag is false, if the object is marked
    3535     * as deleted on the server.
    3636     */
     
    5454
    5555    /**
    56      * Put several boolean flag to one short int field to save memory.
     56     * Put several boolean flags to one short int field to save memory.
    5757     * Other bits of this field are used in subclasses.
    5858     */
     
    6767     * An id of 0 means an unknown id. The object has not been uploaded yet to
    6868     * know what id it will get.
    69      *
    7069     */
    7170    protected long id = 0;
  • trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java

    r3362 r5251  
    203203     *
    204204     * <ul>
    205      *   <li>if this reader reads referers for an {@see Node}, referring ways are always
     205     *   <li>if this reader reads referers for a {@see Node}, referring ways are always
    206206     *     read individually from the server</li>
    207207     *   <li>if this reader reads referers for an {@see Way} or a {@see Relation}, referring relations
     
    222222            if (isReadFull() ||primitiveType.equals(OsmPrimitiveType.NODE)) {
    223223                for (Way way: waysToCheck) {
    224                     if (!way.isNew() && way.isIncomplete()) {
     224                    if (!way.isNew() && way.hasIncompleteNodes()) {
    225225                        OsmServerObjectReader reader = new OsmServerObjectReader(way.getId(), OsmPrimitiveType.from(way), true /* read full */);
    226226                        DataSet wayDs = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));
     
    233233                Collection<Relation> relationsToCheck  = new ArrayList<Relation>(ds.getRelations());
    234234                for (Relation relation: relationsToCheck) {
    235                     if (!relation.isNew() && relation.isIncomplete()) {
     235                    if (!relation.isNew() && relation.hasIncompleteMembers()) {
    236236                        OsmServerObjectReader reader = new OsmServerObjectReader(relation.getId(), OsmPrimitiveType.from(relation), true /* read full */);
    237237                        DataSet wayDs = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));
Note: See TracChangeset for help on using the changeset viewer.