Changeset 30737 in osm for applications/editors/josm/plugins/pbf/src
- Timestamp:
- 2014-10-18T23:07:52+02:00 (10 years ago)
- Location:
- applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java
r30664 r30737 137 137 // Each node's tags are encoded in alternating <key_id> <value_id>. 138 138 // A single stringid of 0 delimit when the tags of a node ends and the tags of the next node begin. 139 Map<String, String> keys = new HashMap< String, String>();139 Map<String, String> keys = new HashMap<>(); 140 140 while (keyIndex < nodes.getKeysValsCount()) { 141 141 int key_id = nodes.getKeysVals(keyIndex++); … … 172 172 checkTimestamp(info.getTimestamp()); 173 173 node.setTimestamp(getDate(info)); 174 Map<String, String> keys = new HashMap< String, String>();174 Map<String, String> keys = new HashMap<>(); 175 175 for (int i=0; i<n.getKeysCount(); i++) { 176 176 keys.put(getStringById(n.getKeys(i)), getStringById(n.getVals(i))); … … 197 197 checkTimestamp(info.getTimestamp()); 198 198 way.setTimestamp(getDate(info)); 199 Map<String, String> keys = new HashMap< String, String>();199 Map<String, String> keys = new HashMap<>(); 200 200 for (int i=0; i<w.getKeysCount(); i++) { 201 201 keys.put(getStringById(w.getKeys(i)), getStringById(w.getVals(i))); … … 203 203 way.setKeys(keys); 204 204 long previousId = 0; // Node ids are delta coded 205 Collection<Long> nodeIds = new ArrayList< Long>();205 Collection<Long> nodeIds = new ArrayList<>(); 206 206 for (Long id : w.getRefsList()) { 207 207 nodeIds.add(previousId+=id); … … 228 228 checkTimestamp(info.getTimestamp()); 229 229 rel.setTimestamp(getDate(info)); 230 Map<String, String> keys = new HashMap< String, String>();230 Map<String, String> keys = new HashMap<>(); 231 231 for (int i=0; i<r.getKeysCount(); i++) { 232 232 keys.put(getStringById(r.getKeys(i)), getStringById(r.getVals(i))); … … 234 234 rel.setKeys(keys); 235 235 long previousId = 0; // Member ids are delta coded 236 Collection<RelationMemberData> members = new ArrayList< RelationMemberData>();236 Collection<RelationMemberData> members = new ArrayList<>(); 237 237 for (int i = 0; i<r.getMemidsCount(); i++) { 238 238 long id = previousId+=r.getMemids(i); -
applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java
r30726 r30737 69 69 private abstract class Prim<T extends OsmPrimitive> { 70 70 /** Queue that tracks the list of all primitives. */ 71 ArrayList<T> contents = new ArrayList< T>();71 ArrayList<T> contents = new ArrayList<>(); 72 72 73 73 /**
Note:
See TracChangeset
for help on using the changeset viewer.