1. Johannes Kolb
  2. pyosmium

Commits

Johannes Kolb  committed 49dc52f

rename o_id to id_ to match python interface and coding standards

  • Participants
  • Parent commits ce7a531
  • Branches default

Comments (0)

Files changed (3)

File c_osmium/osm.pxd

View file
 
 cdef extern from "osmium/osm/object.hpp" namespace "Osmium::OSM":
     cdef cppclass Object:
-        osm_object_id_t o_id "id" ()
+        osm_object_id_t id_ "id" ()
         osm_version_t version()
         osm_changeset_id_t changeset()
         osm_user_id_t uid()

File osmium/examples.pyx

View file
         default handler for nodes
         """
         print("NODE:")
-        print("object-id: ", curnode.c_object[0].get().o_id())
+        print("object-id: ", curnode.c_object[0].get().id_())
         print("address: ", <long>curnode.c_object[0].get())
         if curnode.tags:
             self.saved_node = curnode
 
     cpdef way(self, Way curway):
         print("WAY:")
-        print("object-id:", curway.c_object[0].get().o_id())
+        print("object-id:", curway.c_object[0].get().id_())
         print("address:",   <long>curway.c_object[0].get())
         print(curway.tags)
         print(curway.nodes)

File osmium/osm_objects.pxi

View file
 
     property id_:
         def __get__(self):
-            return _getOsmObject(self.c_object).o_id()
+            return _getOsmObject(self.c_object).id_()
     property version:
         def __get__(self):
             return _getOsmObject(self.c_object).version()