diff --git a/tests/resources/macos/134/89.map b/tests/resources/macos/134/89.map index ca4eee69..4ad4af96 100644 Binary files a/tests/resources/macos/134/89.map and b/tests/resources/macos/134/89.map differ diff --git a/tests/resources/macos/134/89.map.lzma b/tests/resources/macos/134/89.map.lzma index ec3c691a..525ec957 100644 Binary files a/tests/resources/macos/134/89.map.lzma and b/tests/resources/macos/134/89.map.lzma differ diff --git a/tests/resources/macos/134/89/merged.osm.pbf b/tests/resources/macos/134/89/merged.osm.pbf index 811afa22..94cd73d5 100644 Binary files a/tests/resources/macos/134/89/merged.osm.pbf and b/tests/resources/macos/134/89/merged.osm.pbf differ diff --git a/tests/resources/macos/134/89/split-liechtenstein.osm.pbf b/tests/resources/macos/134/89/split-liechtenstein.osm.pbf index 3efc68ce..0434d7be 100644 Binary files a/tests/resources/macos/134/89/split-liechtenstein.osm.pbf and b/tests/resources/macos/134/89/split-liechtenstein.osm.pbf differ diff --git a/tests/resources/macos/138/100.map b/tests/resources/macos/138/100.map index e5195a3d..f5e5c24a 100644 Binary files a/tests/resources/macos/138/100.map and b/tests/resources/macos/138/100.map differ diff --git a/tests/resources/macos/138/100.map.lzma b/tests/resources/macos/138/100.map.lzma index 29402ba4..1ecc0066 100644 Binary files a/tests/resources/macos/138/100.map.lzma and b/tests/resources/macos/138/100.map.lzma differ diff --git a/tests/resources/macos/138/100/merged.osm.pbf b/tests/resources/macos/138/100/merged.osm.pbf index 5e1d31f3..cc890c1e 100644 Binary files a/tests/resources/macos/138/100/merged.osm.pbf and b/tests/resources/macos/138/100/merged.osm.pbf differ diff --git a/tests/resources/macos/138/100/split-malta.osm.pbf b/tests/resources/macos/138/100/split-malta.osm.pbf index 759aa545..37d73a50 100644 Binary files a/tests/resources/macos/138/100/split-malta.osm.pbf and b/tests/resources/macos/138/100/split-malta.osm.pbf differ diff --git a/tests/resources/macos/liechtenstein/filtered.o5m.pbf b/tests/resources/macos/liechtenstein/filtered.o5m.pbf index 6e4a59bc..43142f43 100644 Binary files a/tests/resources/macos/liechtenstein/filtered.o5m.pbf and b/tests/resources/macos/liechtenstein/filtered.o5m.pbf differ diff --git a/tests/resources/macos/malta/filtered.o5m.pbf b/tests/resources/macos/malta/filtered.o5m.pbf index 4574712b..2ec3709f 100644 Binary files a/tests/resources/macos/malta/filtered.o5m.pbf and b/tests/resources/macos/malta/filtered.o5m.pbf differ diff --git a/tests/resources/windows/134/89.map b/tests/resources/windows/134/89.map index fb35498a..dc410ff5 100644 Binary files a/tests/resources/windows/134/89.map and b/tests/resources/windows/134/89.map differ diff --git a/tests/resources/windows/134/89.map.lzma b/tests/resources/windows/134/89.map.lzma index 1d18a5a9..9b8e65ea 100644 Binary files a/tests/resources/windows/134/89.map.lzma and b/tests/resources/windows/134/89.map.lzma differ diff --git a/tests/resources/windows/134/89/merged.osm.pbf b/tests/resources/windows/134/89/merged.osm.pbf index be18cb9d..e677d17c 100644 Binary files a/tests/resources/windows/134/89/merged.osm.pbf and b/tests/resources/windows/134/89/merged.osm.pbf differ diff --git a/tests/resources/windows/134/89/split-liechtenstein.osm.pbf b/tests/resources/windows/134/89/split-liechtenstein.osm.pbf index 6ea2c75a..ee2426ba 100644 Binary files a/tests/resources/windows/134/89/split-liechtenstein.osm.pbf and b/tests/resources/windows/134/89/split-liechtenstein.osm.pbf differ diff --git a/tests/resources/windows/138/100.map b/tests/resources/windows/138/100.map index 90a2ec56..d2a6411e 100644 Binary files a/tests/resources/windows/138/100.map and b/tests/resources/windows/138/100.map differ diff --git a/tests/resources/windows/138/100.map.lzma b/tests/resources/windows/138/100.map.lzma index 20d3aae4..0b48269b 100644 Binary files a/tests/resources/windows/138/100.map.lzma and b/tests/resources/windows/138/100.map.lzma differ diff --git a/tests/resources/windows/138/100/merged.osm.pbf b/tests/resources/windows/138/100/merged.osm.pbf index 40ff8259..b6b6ea30 100644 Binary files a/tests/resources/windows/138/100/merged.osm.pbf and b/tests/resources/windows/138/100/merged.osm.pbf differ diff --git a/tests/resources/windows/138/100/split-malta.osm.pbf b/tests/resources/windows/138/100/split-malta.osm.pbf index f93653a0..4fda556d 100644 Binary files a/tests/resources/windows/138/100/split-malta.osm.pbf and b/tests/resources/windows/138/100/split-malta.osm.pbf differ diff --git a/tests/resources/windows/liechtenstein/filtered.o5m b/tests/resources/windows/liechtenstein/filtered.o5m index 53b88cd1..01f75172 100644 Binary files a/tests/resources/windows/liechtenstein/filtered.o5m and b/tests/resources/windows/liechtenstein/filtered.o5m differ diff --git a/tests/resources/windows/malta/filtered.o5m b/tests/resources/windows/malta/filtered.o5m index 6baadaa1..445b8e65 100644 Binary files a/tests/resources/windows/malta/filtered.o5m and b/tests/resources/windows/malta/filtered.o5m differ diff --git a/tests/test_constants.py b/tests/test_constants.py index 91aca511..b20d2f88 100644 --- a/tests/test_constants.py +++ b/tests/test_constants.py @@ -134,11 +134,11 @@ def test_translate_tags_to_keep_full_macos(self): Test translating tags to keep from universal format to macOS // all "tags to keep" """ tags = ['access', 'area=yes', 'bicycle', 'bridge', 'foot=ft_yes, foot_designated', - 'amenity=fuel, cafe, drinking_water', 'shop=bakery', + 'amenity=fuel, cafe, drinking_water', 'shop=bakery, bicycle', 'highway=abandoned, bus_guideway, disused, bridleway, byway, construction, cycleway, footway, living_street, motorway, motorway_link, path, pedestrian, primary, primary_link, residential, road, secondary, secondary_link, service, steps, tertiary, tertiary_link, track, trunk, trunk_link, unclassified', 'natural=coastline, nosea, sea, beach, land, scrub, water, wetland, wood', - 'landuse=forest', - 'leisure=park, nature_reserve', 'railway=abandoned, bus_guideway, disused, funicular, light_rail, miniature, narrow_gauge, preserved, rail, subway, tram', + 'landuse=forest, commercial, industrial, residential, retail', + 'leisure=park, nature_reserve', 'railway=rail, tram, station, stop', 'surface', 'tracktype', 'tunnel', 'waterway=canal, drain, river, riverbank', 'wood=deciduous'] transl_tags = translate_tags_to_keep() @@ -149,7 +149,7 @@ def test_translate_tags_to_keep_full_win(self): """ Test translating tags to keep from universal format to Windows // all "tags to keep" """ - tags_win = 'access= area=yes bicycle= bridge= foot=ft_yes =foot_designated amenity=fuel =cafe =drinking_water shop=bakery highway=abandoned =bus_guideway =disused =bridleway =byway =construction =cycleway =footway =living_street =motorway =motorway_link =path =pedestrian =primary =primary_link =residential =road =secondary =secondary_link =service =steps =tertiary =tertiary_link =track =trunk =trunk_link =unclassified natural=coastline =nosea =sea =beach =land =scrub =water =wetland =wood landuse=forest leisure=park =nature_reserve railway=abandoned =bus_guideway =disused =funicular =light_rail =miniature =narrow_gauge =preserved =rail =subway =tram surface= tracktype= tunnel= waterway=canal =drain =river =riverbank wood=deciduous' + tags_win = 'access= area=yes bicycle= bridge= foot=ft_yes =foot_designated amenity=fuel =cafe =drinking_water shop=bakery =bicycle highway=abandoned =bus_guideway =disused =bridleway =byway =construction =cycleway =footway =living_street =motorway =motorway_link =path =pedestrian =primary =primary_link =residential =road =secondary =secondary_link =service =steps =tertiary =tertiary_link =track =trunk =trunk_link =unclassified natural=coastline =nosea =sea =beach =land =scrub =water =wetland =wood landuse=forest =commercial =industrial =residential =retail leisure=park =nature_reserve railway=rail =tram =station =stop surface= tracktype= tunnel= waterway=canal =drain =river =riverbank wood=deciduous' transl_tags = translate_tags_to_keep(sys_platform='Windows') self.assertEqual(tags_win, transl_tags)