Changeset 15820 in josm for trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java

Timestamp:

2020-02-06T01:03:07+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18654 - Separate unique identifiers per primitive type

This allows to easily update .osm files with negative ids across multiple sessions, such as internal JOSM boundaries file.

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java

@@ -16 +16 @@
 
     /** Node type */
-    NODE(marktr(/* ICON(data/) */"node"), Node.class, NodeData.class),
+    NODE(marktr(/* ICON(data/) */"node"), Node.class, NodeData.class, Node.idGenerator),
     /** Way type */
-    WAY(marktr(/* ICON(data/) */"way"), Way.class, WayData.class),
+    WAY(marktr(/* ICON(data/) */"way"), Way.class, WayData.class, Way.idGenerator),
     /** Relation type */
-    RELATION(marktr(/* ICON(data/) */"relation"), Relation.class, RelationData.class),
+    RELATION(marktr(/* ICON(data/) */"relation"), Relation.class, RelationData.class, Relation.idGenerator),
 
     /** Closed way: only for display, no real type */
-    CLOSEDWAY(marktr(/* ICON(data/) */"closedway"), null, WayData.class),
+    CLOSEDWAY(marktr(/* ICON(data/) */"closedway"), null, WayData.class, Way.idGenerator),
     /** Multipolygon: only for display, no real type */
-    MULTIPOLYGON(marktr(/* ICON(data/) */"multipolygon"), null, RelationData.class);
+    MULTIPOLYGON(marktr(/* ICON(data/) */"multipolygon"), null, RelationData.class, Relation.idGenerator);
 
     private static final Collection<OsmPrimitiveType> DATA_VALUES = Arrays.asList(NODE, WAY, RELATION);
@@ -32 +32 @@
     private final Class<? extends OsmPrimitive> osmClass;
     private final Class<? extends PrimitiveData> dataClass;
+    private final UniqueIdGenerator idGenerator;
 
-    OsmPrimitiveType(String apiTypeName, Class<? extends OsmPrimitive> osmClass, Class<? extends PrimitiveData> dataClass) {
+    OsmPrimitiveType(String apiTypeName, Class<? extends OsmPrimitive> osmClass, Class<? extends PrimitiveData> dataClass,
+            UniqueIdGenerator idGenerator) {
         this.apiTypeName = apiTypeName;
         this.osmClass = osmClass;
         this.dataClass = dataClass;
+        this.idGenerator = idGenerator;
     }
 
@@ -154 +157 @@
     }
 
+    /**
+     * Returns the unique identifier generator.
+     * @return the unique identifier generator
+     * @since 15820
+     */
+    public final UniqueIdGenerator getIdGenerator() {
+        return idGenerator;
+    }
+
     @Override
     public String toString() {