cdk
diff --git a/‎base/core/src/main/java/org/openscience/cdk/AtomRef.java‎
Lines changed: 11 additions & 0 deletions b/‎base/core/src/main/java/org/openscience/cdk/AtomRef.java‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎base/data/src/main/java/org/openscience/cdk/Atom.java‎
Lines changed: 15 additions & 0 deletions b/‎base/data/src/main/java/org/openscience/cdk/Atom.java‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎base/interfaces/src/main/java/org/openscience/cdk/interfaces/IAtom.java‎
Lines changed: 14 additions & 0 deletions b/‎base/interfaces/src/main/java/org/openscience/cdk/interfaces/IAtom.java‎
Lines changed: 14 additions & 0 deletions
@@ -442,6 +442,17 @@ public void setIsInRing(boolean ring) {
         atom.setIsInRing(ring);
     }
 
+
+    @Override
+    public int getMapIdx() {
+      return atom.getMapIdx();
+    }
+
+    @Override
+    public void setMapIdx(int mapidx) {
+      atom.setMapIdx(mapidx);
+    }
+
     @Override
     public int hashCode() {
         return atom.hashCode();
 
@@ -490,6 +490,21 @@ public void setIsInRing(boolean ring) {
         setFlag(CDKConstants.ISINRING, ring);
     }
 
+    @Override
+    public int getMapIdx() {
+      Integer mapidx = getProperty(CDKConstants.ATOM_ATOM_MAPPING);
+      if (mapidx == null)
+        return 0;
+      return mapidx;
+    }
+
+    @Override
+    public void setMapIdx(int mapidx) {
+      if (mapidx < 0)
+        throw new IllegalArgumentException("setMapIdx(val) value must be >= 0");
+      setProperty(CDKConstants.ATOM_ATOM_MAPPING, mapidx);
+    }
+
     /**
      * Returns a one line string representation of this Atom.
      * Methods is conform RFC #9.
 
@@ -256,6 +256,20 @@ public interface IAtom extends IAtomType {
      */
     void setIsInRing(boolean ring);
 
+    /**
+     * Access the map index for this atom.
+     *
+     * @return the map index (0 if not set)
+     */
+    int getMapIdx();
+
+    /**
+     * Set the map index for this atom.
+     *
+     * @param mapidx the new map index
+     */
+    void setMapIdx(int mapidx);
+
     /**
      * {@inheritDoc}
      */