Node versions

api/v1/countries.py

@@ -83,7 +83,12 @@ async def get_geojson(
             {
                 'type': 'Feature',
                 'geometry': mapping(aed.position.shapely),
-                'properties': {'@osm_type': 'node', '@osm_id': int(aed.id), **aed.tags},
+                'properties': {
+                    '@osm_type': 'node',
+                    '@osm_id': aed.id,
+                    '@osm_version': aed.version,
+                    **aed.tags,
+                },
             }
             for aed in aeds
         ],

api/v1/node.py

@@ -96,11 +96,11 @@ async def get_node(node_id: str, aed_state: AEDStateDep, photo_state: PhotoState
                 **photo_dict,
                 **timezone_dict,
                 'type': 'node',
-                'id': int(aed.id),
+                'id': aed.id,
                 'lat': aed.position.lat,
                 'lon': aed.position.lon,
                 'tags': aed.tags,
-                'version': 0,
+                'version': aed.version,
             }
         ],
     }

api/v1/tile.py

@@ -128,7 +128,7 @@ async def _get_tile_aed(z: int, bbox: BBox, aed_state: AEDState) -> bytes:
                     {
                         'geometry': aed.position.shapely,
                         'properties': {
-                            'node_id': int(aed.id),
+                            'node_id': aed.id,
                             'access': aed.access,
                         },
                     }

config.py

@@ -10,7 +10,6 @@
 
 NAME = 'openaedmap-backend'
 VERSION = '2.6.1'
-VERSION_TIMESTAMP = 0
 CREATED_BY = f'{NAME} {VERSION}'
 WEBSITE = 'https://openaedmap.org'
 USER_AGENT = f'{NAME}/{VERSION} (+{WEBSITE})'

models/aed.py

@@ -5,10 +5,11 @@
 
 @dataclass(frozen=True, slots=True)
 class AED:
-    id: str
+    id: int
     position: LonLat
     country_codes: list[str] | None
     tags: dict[str, str]
+    version: int
 
     @property
     def access(self) -> str:

shell.nix

@@ -21,7 +21,6 @@ let
     # -- Misc
     (writeShellScriptBin "make-version" ''
       sed -i -r "s|VERSION = '([0-9.]+)'|VERSION = '\1.$(date +%y%m%d)'|g" config.py
-      sed -i -r "s|VERSION_TIMESTAMP = ([0-9.]+)|VERSION_TIMESTAMP = $(date +%s)|g" config.py
     '')
   ] ++ lib.optionals isDevelopment [
     # Development packages

states/aed_state.py

@@ -23,18 +23,15 @@
 from transaction import Transaction
 from utils import as_dict, print_run_time, retry_exponential
 
-_AED_QUERY = 'node[emergency=defibrillator];out body qt;'
+_AED_QUERY = 'node[emergency=defibrillator];out meta qt;'
 
 
 async def _should_update_db() -> tuple[bool, float]:
     doc = await get_state_doc('aed')
-    if doc is None:
+    if doc is None or doc.get('version', 1) < 2:
         return True, 0
 
-    update_timestamp = doc['update_timestamp']
-    # if update_timestamp < VERSION_TIMESTAMP:
-    #     return True, update_timestamp
-
+    update_timestamp: float = doc['update_timestamp']
     update_age = time() - update_timestamp
     if update_age > AED_UPDATE_DELAY.total_seconds():
         return True, update_timestamp
@@ -92,7 +89,13 @@ def _process_overpass_node(node: dict) -> AED:
     tags = node.get('tags', {})
     is_valid = _is_defibrillator(tags)
     assert is_valid, 'Unexpected non-defibrillator node'
-    return AED(id=str(node['id']), position=LonLat(node['lon'], node['lat']), country_codes=None, tags=tags)
+    return AED(
+        id=node['id'],
+        position=LonLat(node['lon'], node['lat']),
+        country_codes=None,
+        tags=tags,
+        version=node['version'],
+    )
 
 
 async def _update_db_snapshot() -> None:
@@ -104,7 +107,7 @@ async def _update_db_snapshot() -> None:
     async with Transaction() as s:
         await AED_COLLECTION.delete_many({}, session=s)
         await AED_COLLECTION.insert_many(insert_many_arg, session=s)
-        await set_state_doc('aed', {'update_timestamp': data_timestamp}, session=s)
+        await set_state_doc('aed', {'update_timestamp': data_timestamp, 'version': 2}, session=s)
 
     if aeds:
         print('🩺 Updating country codes')
@@ -122,13 +125,14 @@ def _process_action(action: dict) -> Iterable[AED | str]:
     def _process_create_or_modify(node: dict) -> AED | str:
         node_tags = _parse_xml_tags(node)
         node_valid = _is_defibrillator(node_tags)
-        node_id = str(node['@id'])
+        node_id = int(node['@id'])
         if node_valid:
             return AED(
                 id=node_id,
                 position=LonLat(float(node['@lon']), float(node['@lat'])),
                 country_codes=None,
                 tags=node_tags,
+                version=int(node['@version']),
             )
         else:
             return node_id
@@ -169,7 +173,7 @@ async def _update_db_diffs(last_update: float) -> None:
     # keep transaction as short as possible: avoid doing any computation inside
     async with Transaction() as s:
         await AED_COLLECTION.bulk_write(bulk_write_arg, ordered=True, session=s)
-        await set_state_doc('aed', {'update_timestamp': data_timestamp}, session=s)
+        await set_state_doc('aed', {'update_timestamp': data_timestamp, 'version': 2}, session=s)
 
     if aeds:
         print('🩺 Updating country codes')

states/country_state.py

@@ -60,10 +60,7 @@ async def _should_update_db() -> tuple[bool, float]:
     if doc is None:
         return True, 0
 
-    update_timestamp = doc['update_timestamp']
-    # if update_timestamp < VERSION_TIMESTAMP:
-    #     return True, update_timestamp
-
+    update_timestamp: float = doc['update_timestamp']
     update_age = time() - update_timestamp
     if update_age > COUNTRY_UPDATE_DELAY.total_seconds():
         return True, update_timestamp