Update osm enrich for checking way and relation in split way

Author: meomancer

Makefile

@@ -16,7 +16,7 @@ build:
 	@echo "------------------------------------------------------------------"
 	@echo "Building in production mode"
 	@echo "------------------------------------------------------------------"
-	@docker-compose build
+	@docker-compose build osmenrich
 
 redeploy:
 	@echo

docker-compose.yml

@@ -74,6 +74,9 @@ services:
 
   osmenrich:
     image: kartoza/docker-osm:osmenrich-latest
+    build:
+      context: ./docker-osmenrich
+      dockerfile: Dockerfile
     volumes:
       - settings-data:/home/settings
       - import_done:/home/import_done

docker-osmenrich/enrich.py

@@ -444,15 +444,25 @@ def process_empty_changeset_from_table(self, table_name, table_columns, osm_id_c
 
         :param osm_id_column: Column name of osm_id
         :type osm_id_column: str
+
+        :param extra_where: Other where for query
+        :type extra_where: str
         """
         # noinspection PyUnboundLocalVariable
         connection = self.create_connection()
         cursor = connection.cursor()
         row_batch = {}
         osm_ids = []
         try:
-            check_sql = ''' select * from %s."%s" WHERE "changeset_timestamp" 
-            IS NULL AND "osm_id" IS NOT NULL ORDER BY "osm_id" ''' % (self.default['DBSCHEMA_PRODUCTION'], table_name)
+            check_sql = f''' 
+                select * from {self.default['DBSCHEMA_PRODUCTION']}.{table_name} WHERE "changeset_timestamp" 
+                IS NULL AND "{osm_id_column}" IS NOT NULL 
+            '''
+            if extra_where:
+                check_sql += f' AND {extra_where} '
+
+            check_sql += f''' ORDER BY "{osm_id_column}"'''
+
             cursor.execute(check_sql)
             row = True
             while row:
@@ -461,10 +471,15 @@ def process_empty_changeset_from_table(self, table_name, table_columns, osm_id_c
                 if row:
                     row = dict(zip(table_columns, row))
                     row_batch['%s' % row[osm_id_column]] = row
-                    osm_ids.append('%s' % row[osm_id_column])
-                    if len(osm_ids) == 30:
+                    try:
+                        osm_ids.append(f'{abs(row[osm_id_column])}')
+                    except:
+                        osm_ids.append('%s' % row[osm_id_column])
+                    if len(osm_ids) == 20:
                         self.update_osm_enrich_from_api_in_batch(
-                            osm_ids, osm_type, row_batch, table_name, osm_id_column)
+                            osm_ids, osm_type, row_batch, table_name,
+                            osm_id_column
+                        )
                         row_batch = {}
                         osm_ids = []
 
@@ -484,9 +499,22 @@ def enrich_empty_changeset(self):
             osm_type = table_data['osm_type']
             columns = table_data['columns']
             if osm_id_columnn is not None:
-                self.info('Checking data from table %s' % table)
-                self.process_empty_changeset_from_table(
-                    table, columns, osm_id_columnn, osm_type)
+                if osm_type == 'way':
+                    self.info('Checking data from table %s with type way' % table)
+                    self.process_empty_changeset_from_table(
+                        table, columns, osm_id_columnn, 'way',
+                        extra_where=f'"{osm_id_columnn}" > 0'
+                    )
+                    self.info('Checking data from table %s with type relation' % table)
+                    self.process_empty_changeset_from_table(
+                        table, columns, osm_id_columnn, 'relation',
+                        extra_where=f'"{osm_id_columnn}" < 0'
+                    )
+                else:
+                    self.info('Checking data from table %s' % table)
+                    self.process_empty_changeset_from_table(
+                        table, columns, osm_id_columnn, osm_type
+                    )
             else:
                 self.info('Does not know osm_id column for %s.' % table)