From 91305db8373b45488d14df7908c7f2001f9b9bf3 Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Sun, 23 Mar 2025 13:16:54 +0100
Subject: [PATCH] fixed upstream in ATP
---
0_config.py | 44 -------------------
17_list_mismatching_brand_wikidata.py | 1 -
...ue_reports_about_poorly_matched_entries.py | 1 -
3 files changed, 46 deletions(-)
diff --git a/0_config.py b/0_config.py
index 39cf0b0..3e58d20 100644
--- a/0_config.py
+++ b/0_config.py
@@ -275,7 +275,6 @@ def spiders_with_known_bad_website_tag():
'aldi_sud_de', # https://github.com/alltheplaces/alltheplaces/issues/9415
'agata_meble_pl', # https://github.com/alltheplaces/alltheplaces/issues/9409
'cheddars_scratch_kitchen', # https://github.com/alltheplaces/alltheplaces/issues/11205
- 'putka_pl', # https://github.com/alltheplaces/alltheplaces/issues/12048 TODO_MERGED 2025-01-23
]
def is_mismatching_name_worth_mentioning(atp_code):
@@ -395,36 +394,6 @@ def is_addr_full_known_to_be_broken(atp_code):
def known_broken_addr_full_spiders():
# addr:full
return [
- #'nissan_cz', # https://github.com/alltheplaces/alltheplaces/pull/11782 TODO_MERGED
- #'thelins_konditori_se', # https://github.com/alltheplaces/alltheplaces/pull/11783 TODO_MERGED
- #'move_yourself_au', # https://github.com/alltheplaces/alltheplaces/pull/11792 TODO_MERGED
- #'swedbank_ee', # https://github.com/alltheplaces/alltheplaces/pull/11805 TODO_MERGED
- #'paint_spot_au', # https://github.com/alltheplaces/alltheplaces/pull/11801 TODO_MERGED
- #'gamestop', # https://github.com/alltheplaces/alltheplaces/pull/11817 TODO_MERGED
- #'dsk_bank_bg', # https://github.com/alltheplaces/alltheplaces/pull/11810 TODO_MERGED
- #'empik_pl', # https://github.com/alltheplaces/alltheplaces/pull/11814 TODO_MERGED
- #'coop_alleanza_it', # https://github.com/alltheplaces/alltheplaces/pull/11815 TODO_MERGED
- #'two_men_and_a_truck', # https://github.com/alltheplaces/alltheplaces/issues/11797 https://github.com/alltheplaces/alltheplaces/pull/11816 TODO_MERGED
- #'mcdonalds_latin_america', # https://github.com/alltheplaces/alltheplaces/pull/11863 TODO_MERGED
- #'petstock_au', # https://github.com/alltheplaces/alltheplaces/pull/11864 TODO_MERGED
- #'crown_decorating_centres_gb', # https://github.com/alltheplaces/alltheplaces/pull/11865 TODO_MERGED
- #'torchys_tacos', # https://github.com/alltheplaces/alltheplaces/pull/11866 TODO_MERGED
- #'kaisercraft_au', # https://github.com/alltheplaces/alltheplaces/pull/11867 TODO_MERGED
- #'tag_heuer', # https://github.com/alltheplaces/alltheplaces/pull/11869 TODO_MERGED
- #'fastned', # https://github.com/alltheplaces/alltheplaces/pull/11857 TODO_MERGED
- #'snap_fitness', # https://github.com/alltheplaces/alltheplaces/pull/11858 TODO_MERGED
- #'kfc_it', # https://github.com/alltheplaces/alltheplaces/pull/11859 TODO_MERGED
- #'tops', # https://github.com/alltheplaces/alltheplaces/pull/11860 TODO_MERGED
- #'ccbank_bg', # https://github.com/alltheplaces/alltheplaces/pull/11861 TODO_MERGED
- #'ymca', # https://github.com/alltheplaces/alltheplaces/issues/11797 https://github.com/alltheplaces/alltheplaces/pull/11819 TODO_MERGED
- #'wingstop', # https://github.com/alltheplaces/alltheplaces/pull/11818 TODO_MERGED
- #'byd_auto_au', # https://github.com/alltheplaces/alltheplaces/pull/11854 TODO_MERGED
- #'unicredit_bulbank_bg', # https://github.com/alltheplaces/alltheplaces/pull/11884 TODO_MERGED
- #'alaska_commercial_company', # https://github.com/alltheplaces/alltheplaces/pull/11909 TODO_MERGED
- #'thiele_dk', # https://github.com/alltheplaces/alltheplaces/pull/11889 TODO_MERGED
- #'equatorial_coffee_za', # https://github.com/alltheplaces/alltheplaces/pull/11881 TODO_MERGED
- #'toyota_au', # https://github.com/alltheplaces/alltheplaces/pull/11800 TODO_MERGED
-
'paris_baguette_kr', # https://github.com/alltheplaces/alltheplaces/issues/11797
'easybox_bg', # https://github.com/alltheplaces/alltheplaces/issues/11797
'twin_peaks', # some are not street address either
@@ -805,19 +774,6 @@ def ignored_atp_codes():
# https://github.com/osmlab/name-suggestion-index/tags
# (currently none)
- 'coop_centro_italia_it', # https://github.com/alltheplaces/alltheplaces/pull/11942 TODO_MERGED
- 'sony_gb', # https://github.com/alltheplaces/alltheplaces/issues/11710 TODO_MERGED
- 'topgolf_us', # https://github.com/alltheplaces/alltheplaces/pull/11923 TODO_MERGED
- 'pandora', # https://github.com/alltheplaces/alltheplaces/pull/11940 TODO_MERGED
- 'phillips_66_conoco_76', # https://github.com/alltheplaces/alltheplaces/pull/12068 TODO_MERGED 2025-01-24
- 'vinnies_au', # https://github.com/alltheplaces/alltheplaces/pull/12053#issuecomment-2612499764 TODO_MERGED 2025-01-24
- 'martins_us', # https://github.com/alltheplaces/alltheplaces/pull/12063 TODO_MERGED 2025-01-25
- 'lilly_gr', # https://github.com/alltheplaces/alltheplaces/pull/12075 TODO_MERGED 2025-01-28
- 'bonmarche_gb', # https://github.com/alltheplaces/alltheplaces/pull/12077 TODO_MERGED 2025-01-28
- 'smythstoys_gb', # https://github.com/alltheplaces/alltheplaces/pull/12078 TODO_MERGED 2025-01-28
- 'puebloweb_pr_us', # https://github.com/alltheplaces/alltheplaces/pull/11908 TODO_MERGED 2025-02-03
- 'pizza_express_gb', # https://github.com/alltheplaces/alltheplaces/issues/11007 TODO_MERGED closed 2025-02-23 as fixed in NSI
-
'cinnabon_ru', # cafe or fast food? maybe these should be considered as matching? TODO - see file:///media/mateusz/OSM_cache/ATP_matcher_cache/output_for_global_scan/missing_shops__cinnabon_ru.html (generated by 14_...) and https://www.openstreetmap.org/search?query=Cinnabon%2C+Russia#map=19/55.768162/37.598584
'benchmarx_gb', # TODO_LOW_PRIORITY https://www.benchmarxkitchens.co.uk/branches/llanelli - "Located inside Travis Perkins" - should it be mapped as a separate shop then?
'sklavenitis_gr', # https://github.com/alltheplaces/alltheplaces/pull/11904
diff --git a/17_list_mismatching_brand_wikidata.py b/17_list_mismatching_brand_wikidata.py
index 498660e..ce005e5 100644
--- a/17_list_mismatching_brand_wikidata.py
+++ b/17_list_mismatching_brand_wikidata.py
@@ -38,7 +38,6 @@ def skipping_any_of_this_wikidata_ids(osm_wikidata_id, atp_wikidata_id):
# test_wikidata.py covers these, test is skipped as long as entries are
# listed here in skipping_any_of_this_wikidata_ids
- "Q117547405", "Q7592120", # https://github.com/alltheplaces/alltheplaces/pull/12053 TODO_MERGED
'Q4748528', 'Q5023980', # argh? TODO_LOW_PRIORITY
]:
diff --git a/83_generate_atp_issue_reports_about_poorly_matched_entries.py b/83_generate_atp_issue_reports_about_poorly_matched_entries.py
index 16a5944..d2285e1 100644
--- a/83_generate_atp_issue_reports_about_poorly_matched_entries.py
+++ b/83_generate_atp_issue_reports_about_poorly_matched_entries.py
@@ -25,7 +25,6 @@ def should_be_shown(atp_code, failed_matches, matched, cumulated_likelyhood_of_m
def ignored_atp_codes():
return [
# Fixed in upstream configuration, remove once new ATP with this changes is produced
- 'cost_plus_world_market', # TODO_MERGED fixed in ATP on 2025-01-29, see https://github.com/alltheplaces/alltheplaces/commit/e64bd1dd6a82ece507ecf446801392449116b0a9
# reportedly mapped wrong in OSM
'unicredit_bulbank_bg', # https://github.com/alltheplaces/alltheplaces/pull/11901#issuecomment-2577769704