Skip to content

Commit 2c43857

Browse files
frodrigofrodrigo
committed
Rename merge Analyser_Merge -> Analyser_Merge_Point
1 parent e8c79ac commit 2c43857

File tree

79 files changed

+252
-252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+252
-252
lines changed

‎analysers/Analyser_Merge.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1066,7 +1066,7 @@ def __init__(self, select = Select(), osmRef = "NULL", conflationDistance = None
10661066
self.subclass_hash = subclass_hash
10671067
self.mapping = mapping
10681068

1069-
class Analyser_Merge(Analyser_Osmosis):
1069+
class Analyser_Merge_Point(Analyser_Osmosis):
10701070

10711071
def __init__(self, config, logger):
10721072
Analyser_Osmosis.__init__(self, config, logger)

‎analysers/Analyser_Merge_Dynamic.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
###########################################################################
2222

2323
from .Analyser import Analyser
24-
from .Analyser_Merge import Analyser_Merge, Source, Load_XY, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, Source, Load_XY, Mapping
2525

2626

2727
class Analyser_Merge_Dynamic(Analyser):
@@ -50,17 +50,17 @@ def timestamp(self):
5050
return analyser_obj.timestamp()
5151

5252

53-
class SubAnalyser_Merge_Dynamic(Analyser_Merge):
53+
class SubAnalyser_Merge_Dynamic(Analyser_Merge_Point):
5454

5555
def __init__(self, config, error_file, logger):
56-
Analyser_Merge.__init__(self, config, logger)
56+
Analyser_Merge_Point.__init__(self, config, logger)
5757
self.error_file = error_file
5858

5959
def init(self, url, name, source = Source(), load = Load_XY(), mapping = Mapping()):
6060
if not load.table_name: # Rename all table of sub analysers the same
6161
load.table_name = self.__class__.__name__.lower()[18:]
6262
load.table_name = '_'.join(load.table_name.split('_')[:-1])
63-
Analyser_Merge.init(self, url, name, source, load, mapping)
63+
Analyser_Merge_Point.init(self, url, name, source, load, mapping)
6464

6565
def open_error_file(self):
6666
pass

‎analysers/analyser_merge_bicycle_parking_ES_madrid.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, Source, SHP, LoadGeomCentroid, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, Source, SHP, LoadGeomCentroid, Conflate, Select, Mapping
2525

2626

27-
class Analyser_Merge_Bicycle_Parking_ES_Madrid(Analyser_Merge):
27+
class Analyser_Merge_Bicycle_Parking_ES_Madrid(Analyser_Merge_Point):
2828
def __init__(self, config, logger = None):
29-
Analyser_Merge.__init__(self, config, logger)
29+
Analyser_Merge_Point.__init__(self, config, logger)
3030
self.def_class_missing_official(item = 8150, id = 71, level = 3, tags = ['merge', 'public equipment', 'bicycle', 'fix:survey', 'fix:picture'],
3131
title = T_('Bicycle parking not integrated'))
3232

‎analysers/analyser_merge_bicycle_parking_FR_paris.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, SourceOpenDataSoft, CSV, Load_XY, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, SourceOpenDataSoft, CSV, Load_XY, Conflate, Select, Mapping
2525

2626
STANDS_TYPES = {
2727
"Arceau autre": "stands",
@@ -39,9 +39,9 @@
3939
}
4040

4141

42-
class Analyser_Merge_Bicycle_Parking_FR_Paris(Analyser_Merge):
42+
class Analyser_Merge_Bicycle_Parking_FR_Paris(Analyser_Merge_Point):
4343
def __init__(self, config, logger = None):
44-
Analyser_Merge.__init__(self, config, logger)
44+
Analyser_Merge_Point.__init__(self, config, logger)
4545
self.def_class_missing_official(item = 8150, id = 21, level = 3, tags = ['merge', 'public equipment', 'bicycle', 'fix:survey', 'fix:picture'],
4646
title = T_('Paris bicycle parking not integrated'))
4747

@@ -70,9 +70,9 @@ def __init__(self, config, logger = None):
7070
mapping1 = tag_mapping )))
7171

7272

73-
class Analyser_Merge_Motorcycle_Parking_FR_Paris(Analyser_Merge):
73+
class Analyser_Merge_Motorcycle_Parking_FR_Paris(Analyser_Merge_Point):
7474
def __init__(self, config, logger = None):
75-
Analyser_Merge.__init__(self, config, logger)
75+
Analyser_Merge_Point.__init__(self, config, logger)
7676
self.def_class_missing_official(item = 8150, id = 31, level = 3, tags = ['merge', 'public equipment', 'motorcycle', 'fix:survey', 'fix:picture'],
7777
title = T_('Paris motorcycle parking not integrated'))
7878

@@ -100,9 +100,9 @@ def __init__(self, config, logger = None):
100100
mapping1 = tag_mapping )))
101101

102102

103-
class Analyser_Merge_Bicycle_Motorcycle_Parking_FR_Paris(Analyser_Merge):
103+
class Analyser_Merge_Bicycle_Motorcycle_Parking_FR_Paris(Analyser_Merge_Point):
104104
def __init__(self, config, logger = None):
105-
Analyser_Merge.__init__(self, config, logger)
105+
Analyser_Merge_Point.__init__(self, config, logger)
106106
self.def_class_missing_official(item = 8150, id = 41, level = 3, tags = ['merge', 'public equipment', 'bicycle', 'motorcycle', 'fix:survey', 'fix:picture'],
107107
title = T_('Paris shared motorcycle/motorcycle parking not integrated'))
108108

‎analysers/analyser_merge_bicycle_rental_FR_IDF.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, SourceOpenDataSoft, GeoJSON, Load_XY, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, SourceOpenDataSoft, GeoJSON, Load_XY, Conflate, Select, Mapping
2525

2626

27-
class Analyser_Merge_Bicycle_Rental_FR_IDF(Analyser_Merge):
27+
class Analyser_Merge_Bicycle_Rental_FR_IDF(Analyser_Merge_Point):
2828
def __init__(self, config, logger = None):
29-
Analyser_Merge.__init__(self, config, logger)
29+
Analyser_Merge_Point.__init__(self, config, logger)
3030
self.def_class_missing_official(item = 8160, id = 11, level = 3, tags = ['merge', 'public equipment', 'bicycle', 'fix:survey', 'fix:picture'],
3131
title = T_('{0} bicycle rental not integrated', 'IDF'))
3232
self.def_class_possible_merge(item = 8161, id = 13, level = 3, tags = ['merge', 'public equipment', 'bicycle', 'fix:survey', 'fix:picture'],

‎analysers/analyser_merge_bicycle_rental_FR_bm.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, SourceOpenDataSoft, GeoJSON, Load_XY, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, SourceOpenDataSoft, GeoJSON, Load_XY, Conflate, Select, Mapping
2525

2626

27-
class Analyser_Merge_Bicycle_Rental_FR_bm(Analyser_Merge):
27+
class Analyser_Merge_Bicycle_Rental_FR_bm(Analyser_Merge_Point):
2828
def __init__(self, config, logger = None):
29-
Analyser_Merge.__init__(self, config, logger)
29+
Analyser_Merge_Point.__init__(self, config, logger)
3030
self.def_class_missing_official(item = 8160, id = 1, level = 3, tags = ['merge', 'public equipment', 'bicycle', 'fix:survey', 'fix:picture'],
3131
title = T_('{0} bicycle rental not integrated', 'BM'))
3232
self.def_class_possible_merge(item = 8161, id = 3, level = 3, tags = ['merge', 'public equipment', 'bicycle', 'fix:survey', 'fix:picture'],

‎analysers/analyser_merge_carpool_FR.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, SourceDataGouv, CSV, Load_XY, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, SourceDataGouv, CSV, Load_XY, Conflate, Select, Mapping
2525

2626

27-
class Analyser_Merge_Carpool_FR(Analyser_Merge):
27+
class Analyser_Merge_Carpool_FR(Analyser_Merge_Point):
2828
def __init__(self, config, logger = None):
29-
Analyser_Merge.__init__(self, config, logger)
29+
Analyser_Merge_Point.__init__(self, config, logger)
3030
self.def_class_missing_official(item = 8130, id = 41, level = 3, tags = ['merge', 'parking', 'carpool', 'fix:imagery', 'fix:survey'],
3131
title = T_('Carpool parking not integrated'))
3232
self.def_class_possible_merge(item = 8131, id = 43, level = 3, tags = ['merge', 'parking', 'carpool', 'fix:imagery', 'fix:survey'],

‎analysers/analyser_merge_cemetery_FR.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, SourceIGN, GPKG, LoadGeomCentroid, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, SourceIGN, GPKG, LoadGeomCentroid, Conflate, Select, Mapping
2525

2626

27-
class Analyser_Merge_Public_Cemetery_FR(Analyser_Merge):
27+
class Analyser_Merge_Public_Cemetery_FR(Analyser_Merge_Point):
2828
def __init__(self, config, logger = None):
29-
Analyser_Merge.__init__(self, config, logger)
29+
Analyser_Merge_Point.__init__(self, config, logger)
3030
self.def_class_missing_official(item = 8480, id = 8, level = 1, tags = ['merge', 'public equipment', 'fix:imagery', 'fix:survey'],
3131
title = T_('Cemetery not integrated'))
3232

‎analysers/analyser_merge_charging_station_FR.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, Source, CSV, Load_XY, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, Source, CSV, Load_XY, Conflate, Select, Mapping
2525

2626

27-
class Analyser_Merge_Charging_station_FR(Analyser_Merge):
27+
class Analyser_Merge_Charging_station_FR(Analyser_Merge_Point):
2828
def __init__(self, config, logger=None):
29-
Analyser_Merge.__init__(self, config, logger)
29+
Analyser_Merge_Point.__init__(self, config, logger)
3030
doc = dict(
3131
detail = T_(
3232
'''A car charging station may be here but is not mapped. The list of the

‎analysers/analyser_merge_college_FR.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, Source, CSV, Load_XY, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, Source, CSV, Load_XY, Conflate, Select, Mapping
2525

2626

27-
class Analyser_Merge_College_FR(Analyser_Merge):
27+
class Analyser_Merge_College_FR(Analyser_Merge_Point):
2828
def __init__(self, config, logger = None):
29-
Analyser_Merge.__init__(self, config, logger)
29+
Analyser_Merge_Point.__init__(self, config, logger)
3030
self.def_class_missing_official(item = 8030, id = 100, level = 3, tags = ['merge', 'fix:survey', 'fix:imagery'],
3131
title = T_('College not integrated'))
3232
self.def_class_missing_osm(item = 7070, id = 101, level = 3, tags = ['merge', 'fix:chair'],

‎analysers/analyser_merge_cycle_parking_FR_bm.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, SourceOpenDataSoft, SHP, LoadGeomCentroid, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, SourceOpenDataSoft, SHP, LoadGeomCentroid, Conflate, Select, Mapping
2525

2626

27-
class Analyser_Merge_Bicycle_Parking_FR_Bordeaux_Metropole(Analyser_Merge):
27+
class Analyser_Merge_Bicycle_Parking_FR_Bordeaux_Metropole(Analyser_Merge_Point):
2828
def __init__(self, config, logger=None):
29-
Analyser_Merge.__init__(self, config, logger)
29+
Analyser_Merge_Point.__init__(self, config, logger)
3030
self.def_class_missing_official(
3131
item=8150, id=50, level=3, tags=['merge', 'public equipment', 'bicycle', 'fix:picture', 'fix:survey'],
3232
title=T_('Bordeaux Metropole bicycle parking not integrated'))
@@ -61,9 +61,9 @@ def __init__(self, config, logger=None):
6161
)
6262

6363

64-
class Analyser_Merge_Motorcycle_Parking_FR_Bordeaux_Metropole(Analyser_Merge):
64+
class Analyser_Merge_Motorcycle_Parking_FR_Bordeaux_Metropole(Analyser_Merge_Point):
6565
def __init__(self, config, logger=None):
66-
Analyser_Merge.__init__(self, config, logger)
66+
Analyser_Merge_Point.__init__(self, config, logger)
6767
self.def_class_missing_official(
6868
item=8150, id=60, level=3, tags=['merge', 'public equipment', 'motorcycle', 'fix:picture', 'fix:survey'],
6969
title=T_('Bordeaux Metropole motorcycle parking not integrated'))

‎analysers/analyser_merge_defibrillators_FR.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, SourceDataGouv, GeoJSON, Load_XY, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, SourceDataGouv, GeoJSON, Load_XY, Conflate, Select, Mapping
2525
import unidecode
2626
import re
2727
from modules import reaccentue
2828

29-
class Analyser_merge_defibrillators_FR(Analyser_Merge):
29+
class Analyser_merge_defibrillators_FR(Analyser_Merge_Point):
3030
def normalizeEtage(self, etg):
3131
if etg is None:
3232
return None
@@ -56,7 +56,7 @@ def normalizeHours(self, jours, heures):
5656
return None
5757

5858
def __init__(self, config, logger = None):
59-
Analyser_Merge.__init__(self, config, logger)
59+
Analyser_Merge_Point.__init__(self, config, logger)
6060
self.def_class_missing_official(item = 8370, id = 120, level = 3, tags = ["merge", "emergency", "fix:picture", "fix:survey"],
6161
title = T_("Defibrillator not integrated"),
6262
trap = T_("Location of defibrillators from this dataset can be very approximative. Check carefully the position before adding to OSM."))

‎analysers/analyser_merge_defibrillators_FR_aedmap.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, Source, CSV, Load_XY, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, Source, CSV, Load_XY, Conflate, Select, Mapping
2525
from modules import reaccentue
2626

27-
class Analyser_merge_defibrillators_FR_aedmap(Analyser_Merge):
27+
class Analyser_merge_defibrillators_FR_aedmap(Analyser_Merge_Point):
2828
def cleanName(self, name):
2929
return reaccentue.reaccentue(name) if name.upper() == name else name
3030

3131
def __init__(self, config, logger = None):
32-
Analyser_Merge.__init__(self, config, logger)
32+
Analyser_Merge_Point.__init__(self, config, logger)
3333
self.def_class_missing_official(item = 8370, id = 130, level = 3, tags = ["merge", "emergency", "fix:picture", "fix:survey"],
3434
title = T_("Defibrillator not integrated"))
3535

‎analysers/analyser_merge_defibrillators_FR_basrhin.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, SourceDataGouv, GeoJSON, Load_XY, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, SourceDataGouv, GeoJSON, Load_XY, Conflate, Select, Mapping
2525

2626

27-
class Analyser_merge_defibrillators_FR_basrhin(Analyser_Merge):
27+
class Analyser_merge_defibrillators_FR_basrhin(Analyser_Merge_Point):
2828
def __init__(self, config, logger = None):
29-
Analyser_Merge.__init__(self, config, logger)
29+
Analyser_Merge_Point.__init__(self, config, logger)
3030
self.def_class_missing_official(item = 8370, id = 20, level = 3, tags = ['merge', "emergency", "fix:picture", "fix:survey"],
3131
title = T_('Defibrillator not integrated'))
3232

‎analysers/analyser_merge_defibrillators_FR_cugnaux.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, SourceDataGouv, GeoJSON, Load_XY, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, SourceDataGouv, GeoJSON, Load_XY, Conflate, Select, Mapping
2525

2626

27-
class Analyser_merge_defibrillators_FR_cugnaux(Analyser_Merge):
27+
class Analyser_merge_defibrillators_FR_cugnaux(Analyser_Merge_Point):
2828
def __init__(self, config, logger = None):
29-
Analyser_Merge.__init__(self, config, logger)
29+
Analyser_Merge_Point.__init__(self, config, logger)
3030
self.def_class_missing_official(item = 8370, id = 110, level = 3, tags = ['merge', "emergency", "fix:picture", "fix:survey"],
3131
title = T_('Defibrillator not integrated'))
3232

‎analysers/analyser_merge_defibrillators_FR_gers.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, SourceDataGouv, SHP, LoadGeomCentroid, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, SourceDataGouv, SHP, LoadGeomCentroid, Conflate, Select, Mapping
2525

2626

27-
class Analyser_merge_defibrillators_FR_gers(Analyser_Merge):
27+
class Analyser_merge_defibrillators_FR_gers(Analyser_Merge_Point):
2828
def __init__(self, config, logger = None):
29-
Analyser_Merge.__init__(self, config, logger)
29+
Analyser_Merge_Point.__init__(self, config, logger)
3030
self.def_class_missing_official(item = 8370, id = 90, level = 3, tags = ['merge', "emergency", "fix:picture", "fix:survey"],
3131
title = T_('Defibrillator not integrated'))
3232

‎analysers/analyser_merge_defibrillators_FR_hautesalpes.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, SourceDataGouv, SHP, LoadGeomCentroid, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, SourceDataGouv, SHP, LoadGeomCentroid, Conflate, Select, Mapping
2525

2626

27-
class Analyser_merge_defibrillators_FR_toulouse(Analyser_Merge):
27+
class Analyser_merge_defibrillators_FR_toulouse(Analyser_Merge_Point):
2828
def __init__(self, config, logger = None):
29-
Analyser_Merge.__init__(self, config, logger)
29+
Analyser_Merge_Point.__init__(self, config, logger)
3030
self.def_class_missing_official(item = 8370, id = 50, level = 3, tags = ['merge', "emergency", "fix:picture", "fix:survey"],
3131
title = T_('Defibrillator not integrated'))
3232

‎analysers/analyser_merge_defibrillators_FR_issylesmoulineaux.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, SourceOpenDataSoft, CSV, Load_XY, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, SourceOpenDataSoft, CSV, Load_XY, Conflate, Select, Mapping
2525

2626

27-
class Analyser_merge_defibrillators_FR_issylesmoulineaux(Analyser_Merge):
27+
class Analyser_merge_defibrillators_FR_issylesmoulineaux(Analyser_Merge_Point):
2828
def __init__(self, config, logger = None):
29-
Analyser_Merge.__init__(self, config, logger)
29+
Analyser_Merge_Point.__init__(self, config, logger)
3030
self.def_class_missing_official(item = 8370, id = 10, level = 3, tags = ['merge', "emergency", "fix:picture", "fix:survey"],
3131
title = T_('Defibrillator not integrated'))
3232

‎analysers/analyser_merge_defibrillators_FR_lorient.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, SourceDataGouv, GeoJSON, Load_XY, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, SourceDataGouv, GeoJSON, Load_XY, Conflate, Select, Mapping
2525

2626

27-
class Analyser_merge_defibrillators_FR_lorient(Analyser_Merge):
27+
class Analyser_merge_defibrillators_FR_lorient(Analyser_Merge_Point):
2828
def __init__(self, config, logger = None):
29-
Analyser_Merge.__init__(self, config, logger)
29+
Analyser_Merge_Point.__init__(self, config, logger)
3030
self.def_class_missing_official(item = 8370, id = 100, level = 3, tags = ['merge', "emergency", "fix:picture", "fix:survey"],
3131
title = T_('Defibrillator not integrated'))
3232

‎analysers/analyser_merge_defibrillators_FR_montfort.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
###########################################################################
2222

2323
from modules.OsmoseTranslation import T_
24-
from .Analyser_Merge import Analyser_Merge, SourceDataGouv, CSV, Load_XY, Conflate, Select, Mapping
24+
from .Analyser_Merge import Analyser_Merge_Point, SourceDataGouv, CSV, Load_XY, Conflate, Select, Mapping
2525

2626

27-
class Analyser_merge_defibrillators_FR_montfort(Analyser_Merge):
27+
class Analyser_merge_defibrillators_FR_montfort(Analyser_Merge_Point):
2828
def __init__(self, config, logger = None):
29-
Analyser_Merge.__init__(self, config, logger)
29+
Analyser_Merge_Point.__init__(self, config, logger)
3030
self.def_class_missing_official(item = 8370, id = 70, level = 3, tags = ['merge', "emergency", "fix:picture", "fix:survey"],
3131
title = T_('Defibrillator not integrated'))
3232

0 commit comments

Comments
 (0)