osm2pgsql-replication: reintroduce default default rollback

Author: lonvia

scripts/osm2pgsql-replication

@@ -185,9 +185,8 @@ class Osm2pgsqlProperties:
                                  "Use --start-at to set an explicit date.")
 
             date = from_osm_date(date)
-            if start_at is not None:
-                date -= dt.timedelta(minutes=start_at)
-                seq = None
+            date -= dt.timedelta(minutes=start_at or 180)
+            seq = None
         else:
             seq = int(seq)
 
@@ -261,8 +260,7 @@ class LegacyProperties:
         except ValueError:
             raise DBError(1, f"Cannot parse timestamp '{date}'")
 
-        if isinstance(start_at, int):
-            date -= dt.timedelta(minutes=start_at)
+        date -= dt.timedelta(minutes=start_at or 180)
 
         return server, None, date
 

tests/bdd/command-line/replication.feature

@@ -135,6 +135,29 @@ Feature: Tests for the osm2pgsql-replication script with property table
             | replication_timestamp       | 2020-10-04T03:30:00Z                            |
 
 
+    Scenario: Replication can be initialised from database date
+        Given the OSM data
+            """
+            n34 Tamenity=restaurant x77 y45.3 t2020-10-04T04:00:01Z
+            """
+        And the replication service at https://planet.openstreetmap.org/replication/minute
+            | sequence | timestamp            |
+            | 345      | 2020-10-04T01:00:00Z |
+            | 346      | 2020-10-04T02:00:00Z |
+            | 347      | 2020-10-04T03:00:00Z |
+        When running osm2pgsql pgsql with parameters
+            | --slim |
+
+        And running osm2pgsql-replication
+            | init |
+
+        Then table osm2pgsql_properties contains
+            | property                    | value                                           |
+            | replication_base_url        | https://planet.openstreetmap.org/replication/minute |
+            | replication_sequence_number | 345                                             |
+            | replication_timestamp       | 2020-10-04T01:00:01Z                            |
+
+
     Scenario: Replication can be initialised with a rollback (no previous replication info)
         Given the OSM data
             """
@@ -195,7 +218,7 @@ Feature: Tests for the osm2pgsql-replication script with property table
             | property                    | value                      |
             | replication_base_url        | https://custom.replication |
             | replication_sequence_number | 1346                       |
-            | replication_timestamp       | 2013-08-03T15:55:30Z       |
+            | replication_timestamp       | 2013-08-03T12:55:30Z       |
 
 
     Scenario: Updates need an initialised replication

tests/bdd/command-line/replication_legacy.feature

@@ -107,7 +107,7 @@ Feature: Tests for the osm2pgsql-replication script without property table
 
         Then table planet_osm_replication_status contains exactly
             | url                                                 | sequence | importdate at time zone 'UTC' |
-            | https://planet.openstreetmap.org/replication/minute | 346      | 2020-10-15 12:21:53           |
+            | https://planet.openstreetmap.org/replication/minute | 346      | 2020-10-15 09:21:53           |
 
 
     Scenario: Replication can be initialised from the data in the database with rollback