diff --git a/app/src/main/assets/country_metadata/AM.yml b/app/src/main/assets/country_metadata/AM.yml index 03a2c75ed3..7d78ac463a 100644 --- a/app/src/main/assets/country_metadata/AM.yml +++ b/app/src/main/assets/country_metadata/AM.yml @@ -9,5 +9,6 @@ livingStreetSignStyle: russia mobileCountryCode: 283 officialLanguages: [hy] orchardProduces: [grape, apricot, apple, peach, tomato, pear, plum, walnut, cherry, fig, hazelnut] +parcelLockerBrand: [Գլոբինգ, Onex, OmniCDEK] slowZoneLabelPosition: top slowZoneLabelText: ԹՈՏՒ diff --git a/app/src/main/assets/country_metadata/AT.yml b/app/src/main/assets/country_metadata/AT.yml index f24e11dbd4..25f1147370 100644 --- a/app/src/main/assets/country_metadata/AT.yml +++ b/app/src/main/assets/country_metadata/AT.yml @@ -17,6 +17,7 @@ noParkingLineStyle: dashed yellow noStoppingLineStyle: yellow officialLanguages: [de] orchardProduces: [grape, apple, strawberry, apricot, pear, hop, plum, blueberry, tomato, peach, walnut, chilli_pepper, sweet_pepper, raspberry, cherry] +parcelLockerBrand: [Amazon Hub, Myflexbox, Post Abholstation, Amazon Locker, MYFLEXBOX, DHL Packstation, Amazon, Tamburi, GLS, Amazon Hub Locker, A1] popularSports: [soccer, tennis, equestrian, beachvolleyball] postboxesHaveCollectionTimes: true regularShoppingDays: 5 diff --git a/app/src/main/assets/country_metadata/AU-ACT.yml b/app/src/main/assets/country_metadata/AU-ACT.yml index 98524e220f..f58df582b6 100644 --- a/app/src/main/assets/country_metadata/AU-ACT.yml +++ b/app/src/main/assets/country_metadata/AU-ACT.yml @@ -3,3 +3,4 @@ atmOperators: [Westpac, Commonwealth Bank, St.George, ANZ] chargingStationOperators: ['Tesla, Inc.', Evie Networks] defaultSpeedLimitHasUrbanOrRural: true hasSlowZone: false +parcelLockerBrand: [Australia Post] diff --git a/app/src/main/assets/country_metadata/AU-NSW.yml b/app/src/main/assets/country_metadata/AU-NSW.yml index 703450e04c..fbf66b8880 100644 --- a/app/src/main/assets/country_metadata/AU-NSW.yml +++ b/app/src/main/assets/country_metadata/AU-NSW.yml @@ -4,3 +4,4 @@ chargingStationOperators: [NRMA, Jolt, Evie Networks, 'Tesla, Inc.', Chargefox, clothesContainerOperators: [Dankha Pty Ltd, 1-World Charity Shops] defaultSpeedLimitHasUrbanOrRural: true hasSlowZone: false +parcelLockerBrand: [Australia Post] diff --git a/app/src/main/assets/country_metadata/AU-QLD.yml b/app/src/main/assets/country_metadata/AU-QLD.yml index 4090ac3647..5fa5974431 100644 --- a/app/src/main/assets/country_metadata/AU-QLD.yml +++ b/app/src/main/assets/country_metadata/AU-QLD.yml @@ -2,3 +2,4 @@ atmOperators: [Westpac, Commonwealth Bank, ANZ, NAB, Suncorp, BOQ, Bendigo Bank, rediATM, Heritage Bank, St.George, DC ATM, ATMx, nab, atmx, armaguard, Suncorp Bank, RediATM, National Australia Bank, Bendigo, Bank of Queensland, Armaguard] chargingStationOperators: [Yurika, Evie Networks, 'Tesla, Inc.', Chargefox, AmpCharge] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Australia Post, Amazon Hub] diff --git a/app/src/main/assets/country_metadata/AU-SA.yml b/app/src/main/assets/country_metadata/AU-SA.yml index d03f309fd6..c42357fadf 100644 --- a/app/src/main/assets/country_metadata/AU-SA.yml +++ b/app/src/main/assets/country_metadata/AU-SA.yml @@ -2,3 +2,4 @@ atmOperators: [ANZ, RediATM, Commonwealth Bank, NAB, BankSA, Bank SA, Bendigo Bank, Westpac] chargingStationOperators: [Chargefox, Jolt, 'Tesla, Inc.', Evie Networks, NRMA] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Australia Post] diff --git a/app/src/main/assets/country_metadata/AU-TAS.yml b/app/src/main/assets/country_metadata/AU-TAS.yml index 9936a0625e..744f134232 100644 --- a/app/src/main/assets/country_metadata/AU-TAS.yml +++ b/app/src/main/assets/country_metadata/AU-TAS.yml @@ -1,3 +1,4 @@ # Do not edit. Data is from res/country/metadata and https://github.com/streetcomplete/countrymetadata atmOperators: [Commonwealth Bank, ANZ, Bendigo Bank, RediATM, Westpac, firstpoint, BOQ, NAB, Cashcard] chargingStationOperators: [Electric Highway Tasmania, Chargefox, Evie Networks, TasPorts, Meander Valley Council, Huon Valley Council] +parcelLockerBrand: [Australia Post, Amazon Hub] diff --git a/app/src/main/assets/country_metadata/AU-VIC.yml b/app/src/main/assets/country_metadata/AU-VIC.yml index 333da04dcb..4fdaa10a61 100644 --- a/app/src/main/assets/country_metadata/AU-VIC.yml +++ b/app/src/main/assets/country_metadata/AU-VIC.yml @@ -2,3 +2,4 @@ atmOperators: [Commonwealth Bank, ANZ, NAB, Westpac, Bendigo Bank, BOM, Next, Bankwest, Next Payments, atmx, HSBC, CBA, Commonwealth, Bank of Melbourne, rediATM, atmX, Westpac Bank, RediATM, Precinct, Commonwealth Bank of Australia, Bank Australia] chargingStationOperators: [Evie Networks, Chargefox, Central Victorian Greenhouse Alliance, 'Tesla, Inc.', BP Pulse, AmpCharge, ChargePoint, Jolt, The District Docklands, Secure Parking, RACV, Linga Network, IKEA, Foxcharger] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Australia Post, Amazon Hub] diff --git a/app/src/main/assets/country_metadata/AU-WA.yml b/app/src/main/assets/country_metadata/AU-WA.yml index 369c7e6439..efeef50a12 100644 --- a/app/src/main/assets/country_metadata/AU-WA.yml +++ b/app/src/main/assets/country_metadata/AU-WA.yml @@ -2,3 +2,4 @@ atmOperators: [Westpac, ANZ, Bankwest, Commonwealth Bank, National Australia Bank, NAB, Commonwealth, Bendigo Bank, Commonwealth Bank of Australia, next, nab, DCATM, DC payments, CBA, BankWest] chargingStationOperators: [Chargefox, 'Tesla, Inc.', RAC] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Australia Post] diff --git a/app/src/main/assets/country_metadata/AX.yml b/app/src/main/assets/country_metadata/AX.yml index 10b095cf4f..134f019ff3 100644 --- a/app/src/main/assets/country_metadata/AX.yml +++ b/app/src/main/assets/country_metadata/AX.yml @@ -2,3 +2,4 @@ atmOperators: [OTTO] chargingStationOperators: [ÅEA, ACS-Energy] officialLanguages: [sv] +parcelLockerBrand: [Åland Post] diff --git a/app/src/main/assets/country_metadata/BE-VLG.yml b/app/src/main/assets/country_metadata/BE-VLG.yml index 3d2934a9a6..21da05faa6 100644 --- a/app/src/main/assets/country_metadata/BE-VLG.yml +++ b/app/src/main/assets/country_metadata/BE-VLG.yml @@ -4,3 +4,4 @@ chargingStationOperators: [Allego, Blue Corner, TotalEnergies, Lidl, Last Mile S clothesContainerOperators: [Vlaams Inzamel Centrum Textiel, Wereld Missie Hulp, Limburg.net, Limburg.Net, Vlaams Internationaal Centrum, De Kringwinkel, Vlaams Inzamelcentrum Textiel, Curitas, Curitas n.v., V.H.S. Europ, Kringwinkel, IVIO, WMH, IVAREM, Caritas n.v., ivio, Oxfam, Wereldmissiehulp, Stad Halle, Rode Kruis, Les Petits Riens - Spullenhulp, Curitas NV, www.dekringwinkel.be, de kringwinkel, Wereldmissiehulp en O.L.V. van zeven Weeën vzw, Wereld-Missiehulp, TEXTIEL, Salvatorlaanse Hulpactie & Ontwikkelingshulp, Hulpzorg, De Bremberg, Curitas N.V.] defaultSpeedLimitHasUrbanOrRural: true officialLanguages: [nl] +parcelLockerBrand: [bpost, bpost Pakjesautomaat] diff --git a/app/src/main/assets/country_metadata/BE-WAL.yml b/app/src/main/assets/country_metadata/BE-WAL.yml index 47186bf8ec..a2cd3e0cab 100644 --- a/app/src/main/assets/country_metadata/BE-WAL.yml +++ b/app/src/main/assets/country_metadata/BE-WAL.yml @@ -4,3 +4,4 @@ chargingStationOperators: [Lidl, Allego, 'Tesla, Inc.', Ionity, ZE-MO, Luminus, clothesContainerOperators: [Terre, IDELUX-Environnement, Terre ASBL, Terre asbl, Oxfam, Les Petits Riens, Oxfam-Solidarité, Les Petits Riens - Spullenhulp, ASBL Terre, Caritas n.v., Les Petits Riens-Spullenhulp, Curitas, BEP, ASBL la chaîne du cœur] defaultSpeedLimitHasUrbanOrRural: true officialLanguages: [fr, de] +parcelLockerBrand: [bpost, Mondial Relay, Bpost] diff --git a/app/src/main/assets/country_metadata/BG.yml b/app/src/main/assets/country_metadata/BG.yml index f6a8f9b624..d90204ccae 100644 --- a/app/src/main/assets/country_metadata/BG.yml +++ b/app/src/main/assets/country_metadata/BG.yml @@ -13,6 +13,7 @@ noParkingSignStyle: vienna noStoppingSignStyle: vienna officialLanguages: [bg] orchardProduces: [grape, cherry, plum, walnut, tomato, apple, chilli_pepper, sweet_pepper, peach, apricot, raspberry, hazelnut, almond, strawberry, pear, blueberry] +parcelLockerBrand: [BoxNow, easybox, Еконт, Speedy, Box Now] postboxesHaveCollectionTimes: true slowZoneLabelPosition: top slowZoneLabelText: ЗОНА diff --git a/app/src/main/assets/country_metadata/BY.yml b/app/src/main/assets/country_metadata/BY.yml index e1835bdb24..47b8465512 100644 --- a/app/src/main/assets/country_metadata/BY.yml +++ b/app/src/main/assets/country_metadata/BY.yml @@ -13,5 +13,6 @@ noParkingLineStyle: dashed yellow noStoppingLineStyle: yellow officialLanguages: [be, ru] orchardProduces: [apple, strawberry, grape, plum, tomato, pear, walnut, hazelnut, cherry, cranberry] +parcelLockerBrand: [Белпошта] popularSports: [soccer, basketball, tennis, field_hockey, volleyball, ice_hockey] postboxesHaveCollectionTimes: true diff --git a/app/src/main/assets/country_metadata/CA-AB.yml b/app/src/main/assets/country_metadata/CA-AB.yml index 5f2600caf1..774c5621f2 100644 --- a/app/src/main/assets/country_metadata/CA-AB.yml +++ b/app/src/main/assets/country_metadata/CA-AB.yml @@ -3,3 +3,4 @@ atmOperators: [RBC, CIBC, Instacoin, BMO, Scotiabank, TD Canada Trust, HoneyBadg chargingStationOperators: ['Tesla, Inc.', FLO, Shell, ChargePoint] defaultSpeedLimitHasUrbanOrRural: true officialLanguages: [en] +parcelLockerBrand: [Canada Post] diff --git a/app/src/main/assets/country_metadata/CA-BC.yml b/app/src/main/assets/country_metadata/CA-BC.yml index 27a4370ec0..1084864584 100644 --- a/app/src/main/assets/country_metadata/CA-BC.yml +++ b/app/src/main/assets/country_metadata/CA-BC.yml @@ -4,3 +4,4 @@ chargingStationOperators: [ChargePoint, FLO, 'Tesla, Inc.', BC Hydro, WesGroup, clothesContainerOperators: [Developmental Disabilities Association, Cerebral Palsy Association of BC, Canadian Diabetes Association, Big Brothers of Greater Vancouver Clothing Donation] defaultSpeedLimitHasUrbanOrRural: true officialLanguages: [en] +parcelLockerBrand: [Amazon Locker, Amazon Hub] diff --git a/app/src/main/assets/country_metadata/CA-ON.yml b/app/src/main/assets/country_metadata/CA-ON.yml index df85c4af83..58f113ea74 100644 --- a/app/src/main/assets/country_metadata/CA-ON.yml +++ b/app/src/main/assets/country_metadata/CA-ON.yml @@ -6,3 +6,4 @@ defaultSpeedLimitHasUrbanOrRural: true hasNoStandingSign: true noStandingSignStyle: mutcd text standing officialLanguages: [en] +parcelLockerBrand: [Amazon Hub, Locker InPost] diff --git a/app/src/main/assets/country_metadata/CH.yml b/app/src/main/assets/country_metadata/CH.yml index 480a4818eb..1b9debb016 100644 --- a/app/src/main/assets/country_metadata/CH.yml +++ b/app/src/main/assets/country_metadata/CH.yml @@ -15,6 +15,7 @@ noParkingLineStyle: dashed yellow with Xs noStoppingLineStyle: yellow officialLanguages: [de, fr, it, rm] orchardProduces: [grape, apple, walnut, pear, apricot, cherry, strawberry, plum, raspberry, tomato, blueberry, hop, chilli_pepper, sweet_pepper, kiwi, peach] +parcelLockerBrand: [My Post 24, PickMup, MyPost24, DHL Packstation] popularSports: [soccer, tennis, basketball, shooting, equestrian] postboxesHaveCollectionTimes: true postboxesHaveRef: true diff --git a/app/src/main/assets/country_metadata/CN-BJ.yml b/app/src/main/assets/country_metadata/CN-BJ.yml index f8b0b99d64..9cb0fadc50 100644 --- a/app/src/main/assets/country_metadata/CN-BJ.yml +++ b/app/src/main/assets/country_metadata/CN-BJ.yml @@ -2,3 +2,4 @@ additionalStreetsignLanguages: [en, international] atmOperators: [中国银行, 中国工商银行, 北京银行, 中国建设银行, 中国农业银行, ICBC, 交通银行, 招商银行, 华夏银行, 中国光大银行, 中信银行, 上海浦东发展银行, China Construction Bank, Bank of Beijing] chargingStationOperators: [国家电网有限公司, 国家电网, 'Tesla, Inc.', Tesla Motors Inc.] +parcelLockerBrand: [丰巢] diff --git a/app/src/main/assets/country_metadata/CN-GD.yml b/app/src/main/assets/country_metadata/CN-GD.yml index cc578973e7..7cf55abcb7 100644 --- a/app/src/main/assets/country_metadata/CN-GD.yml +++ b/app/src/main/assets/country_metadata/CN-GD.yml @@ -1,3 +1,4 @@ # Do not edit. Data is from res/country/metadata and https://github.com/streetcomplete/countrymetadata atmOperators: [中国建设银行, 中国银行, 招商银行, 中国工商银行, 中国农业银行, 中国邮政储蓄银行, 交通银行, 中国民生银行, 中信银行, 上海浦东发展银行] chargingStationOperators: [小兔充充, 'Tesla, Inc.', Potevio, CSG] +parcelLockerBrand: [丰巢] diff --git a/app/src/main/assets/country_metadata/CN-JS.yml b/app/src/main/assets/country_metadata/CN-JS.yml index 8c71e39fe6..bcfb816385 100644 --- a/app/src/main/assets/country_metadata/CN-JS.yml +++ b/app/src/main/assets/country_metadata/CN-JS.yml @@ -1,3 +1,4 @@ # Do not edit. Data is from res/country/metadata and https://github.com/streetcomplete/countrymetadata atmOperators: [中国银行, 中国邮政储蓄银行, 中国建设银行, 中国工商银行, 交通银行, ICBC, Bank of China, 江苏银行, 中国民生银行, 中国光大银行, 中信银行, ABC, 浦发银行, 中国农业银行, 上海浦东发展银行, China Construction Bank] chargingStationOperators: [国家电网有限公司, 特来电, 依威能源, 易充网] +parcelLockerBrand: [丰巢] diff --git a/app/src/main/assets/country_metadata/CN-SH.yml b/app/src/main/assets/country_metadata/CN-SH.yml index f3f2730523..e805a6ad49 100644 --- a/app/src/main/assets/country_metadata/CN-SH.yml +++ b/app/src/main/assets/country_metadata/CN-SH.yml @@ -2,3 +2,4 @@ additionalStreetsignLanguages: [en, international] atmOperators: [ICBC, 中国银行, 中国建设银行, 中国工商银行, 上海银行, SPD Bank, 中国邮政储蓄银行, 交通银行BCM ATM, 交通银行, 中国工商银行ICBC ATM, 中国农业银行, 上海浦东发展银行, 工商银行, 中国光大银行] chargingStationOperators: ['Tesla, Inc.', 上海依威能源科技有限公司] +parcelLockerBrand: [丰巢] diff --git a/app/src/main/assets/country_metadata/CZ.yml b/app/src/main/assets/country_metadata/CZ.yml index 97e9c42d6c..7ff5cdff16 100644 --- a/app/src/main/assets/country_metadata/CZ.yml +++ b/app/src/main/assets/country_metadata/CZ.yml @@ -15,6 +15,7 @@ livingStreetSignStyle: vienna mobileCountryCode: 230 officialLanguages: [cs] orchardProduces: [grape, apple, hop, plum, cherry, apricot, pear, strawberry, peach, chilli_pepper, sweet_pepper, tomato, walnut, raspberry] +parcelLockerBrand: [Packeta, AlzaBox, Penguin Box, PPL, GLS, DPD, WE|DO, PPL Box] popularSports: [soccer, tennis, volleyball, beachvolleyball, ice_hockey, handball] postboxesHaveCollectionTimes: true postboxesHaveRef: true diff --git a/app/src/main/assets/country_metadata/DE.yml b/app/src/main/assets/country_metadata/DE.yml index 69f4f22ee0..527f6f0dd0 100644 --- a/app/src/main/assets/country_metadata/DE.yml +++ b/app/src/main/assets/country_metadata/DE.yml @@ -15,6 +15,7 @@ livingStreetSignStyle: vienna mobileCountryCode: 262 officialLanguages: [de] orchardProduces: [grape, apple, hop, strawberry, plum, blueberry, pear, cherry, raspberry, tomato, walnut, apricot, peach, chilli_pepper, sweet_pepper] +parcelLockerBrand: [DHL Packstation, Amazon Hub, Amazon Locker, Packstation, Amazon Hub Locker, DHL, Myflexbox, DHL Paketbox, Amazon, DHL Poststation] popularReligions: [christian, muslim, jewish] popularSports: [soccer, tennis, equestrian] postboxesHaveCollectionTimes: true diff --git a/app/src/main/assets/country_metadata/DK.yml b/app/src/main/assets/country_metadata/DK.yml index 0c27fc3869..af6c90331e 100644 --- a/app/src/main/assets/country_metadata/DK.yml +++ b/app/src/main/assets/country_metadata/DK.yml @@ -14,6 +14,7 @@ livingStreetSignStyle: vienna mobileCountryCode: 238 officialLanguages: [da] orchardProduces: [apple, strawberry, pear, cherry, blueberry, plum, raspberry, tomato] +parcelLockerBrand: [Pakkeboksen, Nærboks, Instabox, instabox] postboxesHaveCollectionTimes: true slowZoneLabelPosition: bottom slowZoneLabelText: Zone diff --git a/app/src/main/assets/country_metadata/EE.yml b/app/src/main/assets/country_metadata/EE.yml index 3dd77fe7a3..422e822696 100644 --- a/app/src/main/assets/country_metadata/EE.yml +++ b/app/src/main/assets/country_metadata/EE.yml @@ -17,6 +17,7 @@ noParkingLineStyle: dashed yellow noStoppingLineStyle: yellow officialLanguages: [et] orchardProduces: [strawberry, apple, raspberry, plum, tomato] +parcelLockerBrand: [Omniva, DPD, DPD Pickup Station, Smartpost Itella, DHL, UPS, Venipak, DPD Pickup] postboxesHaveCollectionTimes: true slowZoneLabelPosition: top slowZoneLabelText: ALA diff --git a/app/src/main/assets/country_metadata/ES-AN.yml b/app/src/main/assets/country_metadata/ES-AN.yml index a8bc0a6063..416fbeecd1 100644 --- a/app/src/main/assets/country_metadata/ES-AN.yml +++ b/app/src/main/assets/country_metadata/ES-AN.yml @@ -2,3 +2,4 @@ atmOperators: [Euronet, Caja Rural, Caixabank, Unicaja, Santander, BBVA, Unicaja Banco, BitBase, Cajamar, Banco Santander, Banco Sabadell, shitcoins.club, La Caixa, ING, Cajasol, CaixaBank, Telebanco 4B, Cash Zone, CajaSur, Bankia, Shitcoins.club, Deutsche Bank, Cajasur, Caja Rural Granada, Banco Popular, cajamar, SabadellSolbank, Caja Rural de Granada, Bankinter, Banco de Andalucía, Banca March] chargingStationOperators: [Iberdrola, Endesa, 'Tesla, Inc.', Mercadona, Ionity, Wenea, SMASSA, Repsol, EDP, Carrefour, Ayuntamiento de Huelva, ALDI] clothesContainerOperators: [Madre Coraje, Humana, Madre coraje, Inagra, Cáritas] +parcelLockerBrand: [Amazon Locker, Amazon Hub Locker, Amazon Hub, CityPaq] diff --git a/app/src/main/assets/country_metadata/ES-CL.yml b/app/src/main/assets/country_metadata/ES-CL.yml index 85e6bf8e6a..86be7702c5 100644 --- a/app/src/main/assets/country_metadata/ES-CL.yml +++ b/app/src/main/assets/country_metadata/ES-CL.yml @@ -2,3 +2,4 @@ atmOperators: [Caixabank, Santander, Ibercaja, Caja Rural, BanCaixa, Banco Santander, Unicaja Banco, Caja Duero, BBVA, Caja España, BitBase, Banco Sabadell, Unicaja, Shitcoins.club, La Caixa, ING, EspañaDuero, Caja Rural de Soria, Caja Rural de Salamanca, Bankia, Banco Popular] chargingStationOperators: [Iberdrola, Zunder, 'Tesla, Inc.', Repsol, Ionity, BMW, Iberdrola Clientes SAU, Senae Energy, Feníe Energía, Endesa, Wenea, IBIL, EDP, Parkmusa, Iberdrola SAU, Cargacoches, Bridgestone] clothesContainerOperators: [Porsiete, Cáritas, Fundación Lesmes, Caritas, Por Siete] +parcelLockerBrand: [Amazon Hub, Amazon Locker] diff --git a/app/src/main/assets/country_metadata/ES-CT.yml b/app/src/main/assets/country_metadata/ES-CT.yml index b0e002d8d8..5dbe3f2ea1 100644 --- a/app/src/main/assets/country_metadata/ES-CT.yml +++ b/app/src/main/assets/country_metadata/ES-CT.yml @@ -3,3 +3,4 @@ atmOperators: [Caixabank, Banco Sabadell, BBVA, Euronet, CaixaBank, Santander, B chargingStationOperators: [Endesa, Iberdrola, Etecnic, 'Tesla, Inc.', ETECNIC, Repsol, Endolla Barcelona, Àrea Metropolitana de Barcelona, Acciona, Zunder, Ajuntament de Barcelona, Ionity, Ajuntament de Vic, ChargePoint, Ajuntament de Mataró, guixesenergia, etecnic, endesa x enelway, Wenea, Wallbox, VNG Aparcaments, TMB, Pradella Sistemi srl, Port de Mataró, Mercadona, Endesa X, Electric Vehicle Charging Station, Consell Comarcal del Baix Ebre, BonArea, Ajuntament de les Masies de Voltregà, Ajuntament de Rubí, Ajuntament de Roses, Ajuntament de Móra la Nova, Ajuntament de Montblanc, Ajuntament d'Alcover, AMB] clothesContainerOperators: [Roba Amiga, Humana, roba amiga, Ropa Amiga] officialLanguages: [ca, es, oc] +parcelLockerBrand: [Amazon Locker, Amazon Hub, CityPaq] diff --git a/app/src/main/assets/country_metadata/ES-GA.yml b/app/src/main/assets/country_metadata/ES-GA.yml index 43bddc91eb..6ae93dc6ad 100644 --- a/app/src/main/assets/country_metadata/ES-GA.yml +++ b/app/src/main/assets/country_metadata/ES-GA.yml @@ -3,3 +3,4 @@ atmOperators: [Abanca, Santander, Banco Sabadell, Banco Santander, ABANCA, Caixa chargingStationOperators: ['Tesla, Inc.', Zunder, Ionity, Endesa, Wenea, Lidl] clothesContainerOperators: [Cáritas, Padre Rubinos] officialLanguages: [gl, es] +parcelLockerBrand: [Amazon Hub Locker, Amazon Hub, Amazon Locker] diff --git a/app/src/main/assets/country_metadata/ES-MC.yml b/app/src/main/assets/country_metadata/ES-MC.yml index 7dfbfc519a..d62a18227f 100644 --- a/app/src/main/assets/country_metadata/ES-MC.yml +++ b/app/src/main/assets/country_metadata/ES-MC.yml @@ -1,3 +1,4 @@ # Do not edit. Data is from res/country/metadata and https://github.com/streetcomplete/countrymetadata atmOperators: [Cajamar, Banco Sabadell, shitcoins.club, Sabadell, BitBase, BBVA] chargingStationOperators: [Iberdrola, Feníe Energía, 'Tesla, Inc.', Lidl] +parcelLockerBrand: [Amazon Hub] diff --git a/app/src/main/assets/country_metadata/ES-MD.yml b/app/src/main/assets/country_metadata/ES-MD.yml index c4c13e19ea..6d242bdc4e 100644 --- a/app/src/main/assets/country_metadata/ES-MD.yml +++ b/app/src/main/assets/country_metadata/ES-MD.yml @@ -2,3 +2,4 @@ atmOperators: [Caixabank, Banco Santander, Santander, Bankia, BBVA, La Caixa, Banco Popular, Banco Sabadell, Weex, Ibercaja, ING, CaixaBank, Bankinter, Unicaja Banco, Telebanco 4B, Euronet Worldwide, shitcoins.club, Kutxabank, BitBase, Servired, IberCaja, Popular, Euro Automatic Cash, Euro 6000, Cajamar, Targobank, Sabadell Atlántico, Kurant, Euro automatic cash, Deutsche Bank, Caja Duero, Banca March, Abanca] chargingStationOperators: [Iberdrola, GIC, IBIL, Repsol, 'Tesla, Inc.', EMT, Lidl, Endesa, Serrano Park III, Serrano Park I, Ionity, Emovili, EDP VE, EDP, Ayuntamiento de Colmenar Viejo] clothesContainerOperators: [Fundación Pueblo para Pueblo, Ayuntamiento de Madrid, jóvenesunidos] +parcelLockerBrand: [Amazon Locker, Amazon Hub, Amazon Hub Locker, CityPaq, Amazon] diff --git a/app/src/main/assets/country_metadata/ES-NC.yml b/app/src/main/assets/country_metadata/ES-NC.yml index f6d5841e49..5c24357bc5 100644 --- a/app/src/main/assets/country_metadata/ES-NC.yml +++ b/app/src/main/assets/country_metadata/ES-NC.yml @@ -2,3 +2,4 @@ atmOperators: [Caixabank, La Caixa, Laboral Kutxa, Caja Rural de Navarra, Caja Rural, BBVA] chargingStationOperators: [Ionity, 'Tesla, Inc.', Ingeteam] officialLanguages: [es, eu] +parcelLockerBrand: [Amazon Locker] diff --git a/app/src/main/assets/country_metadata/ES-PV.yml b/app/src/main/assets/country_metadata/ES-PV.yml index f80054c93f..d56629a021 100644 --- a/app/src/main/assets/country_metadata/ES-PV.yml +++ b/app/src/main/assets/country_metadata/ES-PV.yml @@ -3,3 +3,4 @@ atmOperators: [Kutxabank, Santander, Telebanco 4B, Kutxa, Banco Sabadell, BBVA, chargingStationOperators: [Iberdrola, Repsol, IBIL, 'Tesla, Inc.', Ibil, Endesa X, Endesa, EDP] clothesContainerOperators: [UROLA ERDIKO MANKOMUNITATEA] officialLanguages: [eu, es] +parcelLockerBrand: [Amazon Hub, CityPaq, Amazon Locker] diff --git a/app/src/main/assets/country_metadata/ES-VC.yml b/app/src/main/assets/country_metadata/ES-VC.yml index 801ad523e7..0be6fbf42c 100644 --- a/app/src/main/assets/country_metadata/ES-VC.yml +++ b/app/src/main/assets/country_metadata/ES-VC.yml @@ -3,3 +3,4 @@ atmOperators: [Euronet, Caixabank, Banco Sabadell, Cash Zone, Banco Santander, B chargingStationOperators: [Iberdrola, 'Tesla, Inc.', Repsol, Endesa X, Zunder, Mercadona, Ionity, Endesa, Ayuntamiento de Vallibona, Ayuntamiento de Segorbe, 10-22h] clothesContainerOperators: [Fovasa, Urbarser, Proyecto Lázaro, Cáritas] officialLanguages: [ca, es] +parcelLockerBrand: [Amazon Locker, Amazon Hub, CityPaq] diff --git a/app/src/main/assets/country_metadata/FI.yml b/app/src/main/assets/country_metadata/FI.yml index 6f3e88a2f9..b29dba51d5 100644 --- a/app/src/main/assets/country_metadata/FI.yml +++ b/app/src/main/assets/country_metadata/FI.yml @@ -15,5 +15,6 @@ mobileCountryCode: 244 noEntrySignStyle: yellow officialLanguages: [fi, sv] orchardProduces: [strawberry, apple, raspberry, blueberry, tomato, pear, chilli_pepper, sweet_pepper] +parcelLockerBrand: [Smartpost, Posti, Postin automaatti, Budbee Box, Pakettipiste, Smartmile, PostNord, Budbee] popularSports: [soccer, tennis, basketball, beachvolleyball, shooting, ice_hockey] postboxesHaveCollectionTimes: true diff --git a/app/src/main/assets/country_metadata/FR.yml b/app/src/main/assets/country_metadata/FR.yml index f78628eb9c..74fc3e1efe 100644 --- a/app/src/main/assets/country_metadata/FR.yml +++ b/app/src/main/assets/country_metadata/FR.yml @@ -19,6 +19,7 @@ noParkingLineStyle: dashed yellow noStoppingLineStyle: yellow officialLanguages: [fr] orchardProduces: [grape, apple, walnut, olive, plum, apricot, peach, chestnut, banana, tomato, hazelnut, pear, cherry, kiwi, strawberry] +parcelLockerBrand: [Amazon Hub, Mondial Relay, Amazon Locker, Pickup Station, Amazon, Amazon Hub Locker, Pickup, La Poste, Decathlon, InPost, Vinted, Parcel Pending, Locker 24/7, Casino, Mondial relay, Leroy Merlin, GLS;Relais colis;UPS, Box Colis Mobile, Amazon locker] popularSports: [soccer, tennis, basketball, boules, equestrian, rugby] postboxesHaveCollectionTimes: true postboxesHaveRef: true diff --git a/app/src/main/assets/country_metadata/GB-ENG.yml b/app/src/main/assets/country_metadata/GB-ENG.yml index bc35c3eb0e..e8c0ec3c3b 100644 --- a/app/src/main/assets/country_metadata/GB-ENG.yml +++ b/app/src/main/assets/country_metadata/GB-ENG.yml @@ -2,3 +2,4 @@ atmOperators: [NatWest, Barclays, Cash Zone, Lloyds Bank, Sainsbury's Bank, NoteMachine, RBS, Tesco Bank, Santander, Tesco, Halifax, HSBC UK, Nationwide, Post Office, Cashzone, Sainsbury's, Link, CashZone, The Co-operative Bank, TSB, Bank of Ireland, HSBC, Barclays Bank PLC, Note Machine, Bank Machine, Co-op, Sainsburys, Yorkshire Bank, Natwest, Co-operative Bank, Virgin Money, Royal Bank of Scotland, Metro Bank, Asda, The Co-operative, Co-operative, Nationwide Building Society, Travelex, NMATM, Co-Operative Bank, ASDA, cashzone, Cooperative Bank, Post Office Money, One Stop, Lloyds TSB, Lloyds, John Lewis Finance, Bank of Ireland; Post Office, cash zone, Tesco Express, Post Office Ltd, Notemachine, tesco, Sainsbury, NoteMachine Ltd, Natwest Bank, National Westminster Bank Plc, NM ATM, Morrisons, Marks & Spencer, Lloyds Bank plc, HSBC Bank plc, Coventry Building Society, Coop Bank, Yorkshire Building Society, Sainsburys Bank, Royal Mail, LINK, Coop, Co-Op, Cashzone Ltd, Cardtronics UK Ltd, BankMachine] chargingStationOperators: [Pod Point, BP Pulse, Source London, Gridserve, InstaVolt, 'Tesla, Inc.', GeniePoint, Be Ev, Ubitricity, Connected Kerb, Lancaster City Council, Osprey, ubitricity, ChargePoint, Char.gy, Allego, Rolec, South Lakeland District Council, char.gy, Instavolt, Shell, Charge Your Car, Believ, eVolt, ESB Energy, Booths, Birmingham City Council, Chargemaster, Fastned, mer, evolt, Shell Recharge Solutions, Alfen, Tesla, Swarco, Shell Recharge, POLAR, Mer, Brighton and Hove City Council, Blink, BP, Podpoint, Park & Charge Oxfordshire, Lancaster University, Electric Blue, EO, VendElectric, Tesco, Ionity, Exeter City Council, EVBOX, ubericity, PodPoint, POD Point, Nissan, Iduna, Genie Point, ESB, ChargeMaster, pod point, SSE, EZ Charge, Cumberland Council, Chargy, Charge My Street, Calderdale Council, enelx, Wenea, Swarco E.Connect, Shell Recharge Solutions (UK), Polar, Liberty Charge, Geniepoint, ElectRoad, polar, Tesla Motors Inc., Staveley Mill Yard, Source, Sainsbury's, SWARCO e-connect, SSE Green, Pye Motors, Polar Chargemaster, MFG, Lidl, Lancashire County Council, Keswick Convention Centre, Evolt, EVlink, EV Driver, EV Charge, ESB EV Solutions, EO Charging, EB Charging Ltd, E.ON, ALDI, ABB, vendelectric, urban electric, evyve, Yorkshire Dales National Park, Transport for London, The Hyning Estate, Riverford Organic Farmers, Project EV, Plug-N-Go, Northumberland County Council, NewMotion, GridServe, EVBox, EDF, Dent with Cowgill Parish Council, Chichester District Council., Blain House, Barrow Borough Council] clothesContainerOperators: [The Salvation Army, Salvation Army, TRAID, The Fire Fighters Charity, Brighton & Hove City Council, Scope, British Heart Foundation, Oxfam, Morrisons Foundation, Isle of Wight Council, Islamic Relief, Cystic Fibrosis Trust, Rother District Council, Pink Elephant Group, Traid, Rushcliffe Borough Council, South Norfolk Council, College for International Co-operation and Development, Wilcox, Tesco, Ragcycle, People Unite, Nottingham City Council, Green World Recycling, Yorkshire Air Ambulance, The Firefighters Charity, Teignbridge Council, South Norfolk District Council, SOEX UK;Lancaster City Council, SOEX UK, SOEX, Planet Aid UK, Pink Elephant Group Ltd, Lawrence M Barry & Co, Human Aid, Gedling Borough Council, Child & Teenage Cancer & Leukaemia Foundation, Booths;SOEX, Balls to Cancer, BCP Council] +parcelLockerBrand: [InPost, Amazon Hub, Amazon Locker, Amazon Hub Locker, Locker InPost, Amazon, Evri, Yeep, DPD, Inpost UK Ltd, ebay, Growing Communities, ASDA] diff --git a/app/src/main/assets/country_metadata/GB-SCT.yml b/app/src/main/assets/country_metadata/GB-SCT.yml index 06868d8d96..8e76004a8f 100644 --- a/app/src/main/assets/country_metadata/GB-SCT.yml +++ b/app/src/main/assets/country_metadata/GB-SCT.yml @@ -3,3 +3,4 @@ atmOperators: [RBS, Bank of Scotland, Sainsbury's Bank, NoteMachine, Royal Bank chargingStationOperators: [ChargePlace Scotland, evolt, Pod Point, Charge Place Scotland, CYC, 'Tesla, Inc.', BP Pulse, eVolt, Evolt, Chargemaster, Gridserve, Connected Kerb, Zapcharged, Rolec EV, RAW Charging, Ionity, Fife Council, Fastned, Circontrol, Chargeplace Scotland, Charge Your Car, podpoint, VendElectric, South Lanarkshire Council, Orkney Islands Council, MFG, Highland Council, Dundee City Council, BP] clothesContainerOperators: [The Salvation Army, Salvation Army, Fife Council] defaultSpeedLimitHasUrbanOrRural: false +parcelLockerBrand: [Amazon Hub, InPost, Locker InPost, Amazon Locker, Amazon Hub Locker] diff --git a/app/src/main/assets/country_metadata/GB-WLS.yml b/app/src/main/assets/country_metadata/GB-WLS.yml index 2109c984c9..d10862ebbf 100644 --- a/app/src/main/assets/country_metadata/GB-WLS.yml +++ b/app/src/main/assets/country_metadata/GB-WLS.yml @@ -2,3 +2,4 @@ atmOperators: [Lloyds Bank, Barclays, NatWest, Tesco, Halifax, Santander, HSBC UK, Tesco Bank, Sainsbury's Bank, RBS, Cashzone, Cash Zone, Nationwide, CashZone, TSB, Post Office, Link, HSBC, Co-operative, Barclays Bank PLC] chargingStationOperators: [Pod Point, 'Tesla, Inc.', Osprey Charging, Gridserve, GeniePoint, InstaVolt, Connected Kerb, Clenergy, Osprey, National Trust, ChargePoint, Tesco, Swarco, Swansea Council, Ensto, Dragon Charging, Ceredigion County Council, Cardiff Capital Region, BP Pulse] officialLanguages: [en, cy] +parcelLockerBrand: [Amazon Hub, InPost, Amazon Locker] diff --git a/app/src/main/assets/country_metadata/GE.yml b/app/src/main/assets/country_metadata/GE.yml index cfc2c3697b..eb4ddc5dfd 100644 --- a/app/src/main/assets/country_metadata/GE.yml +++ b/app/src/main/assets/country_metadata/GE.yml @@ -10,5 +10,6 @@ livingStreetSignStyle: russia mobileCountryCode: 282 officialLanguages: [ka] orchardProduces: [grape, apple, orange, hazelnut, peach, walnut, tomato, plum, tea, pear, apricot, cherry, almond, chilli_pepper, sweet_pepper, lemon, lime] +parcelLockerBrand: [Locker.ge] popularSports: [rugby] postboxesHaveCollectionTimes: true diff --git a/app/src/main/assets/country_metadata/GR.yml b/app/src/main/assets/country_metadata/GR.yml index ae5de631db..7f5c0297a4 100644 --- a/app/src/main/assets/country_metadata/GR.yml +++ b/app/src/main/assets/country_metadata/GR.yml @@ -16,6 +16,7 @@ noStoppingLineStyle: yellow noStoppingSignStyle: vienna officialLanguages: [el] orchardProduces: [olive, grape, peach, orange, almond, walnut, tomato, apple, kiwi, apricot, chestnut, pear, fig, lemon, lime, chilli_pepper, sweet_pepper] +parcelLockerBrand: [BoxNow, Box Now, Skroutz Point, Skroutz] postboxesHaveCollectionTimes: true slowZoneLabelPosition: top slowZoneLabelText: ΠΕΡΙΟΧΗ diff --git a/app/src/main/assets/country_metadata/HK.yml b/app/src/main/assets/country_metadata/HK.yml index dfedb9f2cd..0a03495717 100644 --- a/app/src/main/assets/country_metadata/HK.yml +++ b/app/src/main/assets/country_metadata/HK.yml @@ -9,6 +9,7 @@ mobileCountryCode: 454 noStoppingLineStyle: double yellow officialLanguages: [en, zh] orchardProduces: [tomato] +parcelLockerBrand: [順豐速運 SF Express] popularReligions: [chinese_folk, taoist, buddhist] postboxesHaveCollectionTimes: true postboxesHaveRoyalCypher: true diff --git a/app/src/main/assets/country_metadata/HR.yml b/app/src/main/assets/country_metadata/HR.yml index a1506d3f0e..575bbed04f 100644 --- a/app/src/main/assets/country_metadata/HR.yml +++ b/app/src/main/assets/country_metadata/HR.yml @@ -14,6 +14,7 @@ noParkingSignStyle: vienna noStoppingSignStyle: vienna officialLanguages: [hr] orchardProduces: [grape, olive, walnut, hazelnut, apple, plum, cherry, orange, peach, pear, almond, chilli_pepper, sweet_pepper, fig, tomato, blueberry] +parcelLockerBrand: [Paket24, GLS, BoxNow] popularSports: [soccer, tennis, basketball, boules, handball] postboxesHaveCollectionTimes: true slowZoneLabelPosition: bottom diff --git a/app/src/main/assets/country_metadata/HU.yml b/app/src/main/assets/country_metadata/HU.yml index 8f52e2db67..dfb361006a 100644 --- a/app/src/main/assets/country_metadata/HU.yml +++ b/app/src/main/assets/country_metadata/HU.yml @@ -12,6 +12,7 @@ livingStreetSignStyle: vienna mobileCountryCode: 216 officialLanguages: [hu] orchardProduces: [grape, apple, cherry, plum, walnut, apricot, peach, pear, tomato, chilli_pepper, sweet_pepper, strawberry, hazelnut, raspberry, almond, chestnut] +parcelLockerBrand: [GLS, easybox, Foxpost, Packeta, AlzaBox, Magyar Posta Logisztika (MPL), MPL, FoxPost, DHL, Alzabox] pictogramCycleLaneStyle: yellow postboxesHaveCollectionTimes: true slowZoneLabelPosition: bottom diff --git a/app/src/main/assets/country_metadata/ID-JW.yml b/app/src/main/assets/country_metadata/ID-JW.yml index 203646b007..aef10442a9 100644 --- a/app/src/main/assets/country_metadata/ID-JW.yml +++ b/app/src/main/assets/country_metadata/ID-JW.yml @@ -2,3 +2,4 @@ atmOperators: [BNI, BCA, BRI, Bank Mandiri, Mandiri, Bank Central Asia, CIMB Niaga, 'BCA, Mandiri', DKI, 'BNI, Mandiri', 'BCA, BRI', CIMB, Bank Jatim, Bank BRI, 'BCA, BRI, Mandiri', 'BRI, Mandiri', BTN, Bank BCA, 'BCA, BNI', 'CIMB, Mandiri', 'BNI, BRI', ATM BRI, ATM BNI, Bank Syariah Indonesia, 'BCA, CIMB', Link, Bank Muamalat, Panin, Danamon, Bank Negara Indonesia, Bank Jateng, Bank BNI, 'BNI, CIMB, Mandiri', BJB, 'BCA, BNI, Mandiri', mandiri, Sinarmas, NIAGA, Maybank, Bank Rakyat Indonesia, Bank Danamon, Bank DKI, 'BNI, CIMB', ATM BCA, HSBC, CIMB NIAGA, Bank Jabar Banten, Bank Central Asia (BCA), 'BNI, BRI, CIMB, Mandiri', 'BNI, BCA, Mandiri', 'BCA, CIMB, Mandiri', 'BCA, BNI, BRI, CIMB, Mandiri', ATM Mandiri, bri, bca, UOB, PermataBank, Permata Bank, Permata, Panin Bank, 'PT Bank Mandiri (Persero),Tbk', OCBC, Muamalat, DBS, Cimb Niaga, 'Bukopin, CIMB', Bank Negara Indonesia 46, Bank Negara Indonesia (BNI), Bank BTN, 'BRI, BTN', BNI46, 'BCA, DKI', 'BCA, BRI, CIMB', 'BCA, BNI, BRI, DKI, Mandiri', 'BCA, BNI, BRI', ATMi, ATM Center, ATM Bank Jateng, ATM Bank BCA, ATM] chargingStationOperators: [Perusahaan Listrik Negara] officialLanguages: [id, jv, su, mad, bew] +parcelLockerBrand: [PopBox, Paxel] diff --git a/app/src/main/assets/country_metadata/IS.yml b/app/src/main/assets/country_metadata/IS.yml index 8c23043392..ae13ebf0c0 100644 --- a/app/src/main/assets/country_metadata/IS.yml +++ b/app/src/main/assets/country_metadata/IS.yml @@ -13,4 +13,5 @@ mobileCountryCode: 274 noEntrySignStyle: yellow officialLanguages: [is] orchardProduces: [tomato] +parcelLockerBrand: [Pósturinn] postboxesHaveCollectionTimes: true diff --git a/app/src/main/assets/country_metadata/IT-32.yml b/app/src/main/assets/country_metadata/IT-32.yml index e983c4bef6..7f838b4adb 100644 --- a/app/src/main/assets/country_metadata/IT-32.yml +++ b/app/src/main/assets/country_metadata/IT-32.yml @@ -2,3 +2,4 @@ atmOperators: [Banca per il Trentino Alto Adige - Bank für Trentino-Südtirol, Poste Italiane, Raiffeisen, Sparkasse, Cassa Rurale, Volksbank, Raiffeisenkasse, Cassa Rurale Alta Valsugana, Südtiroler Sparkasse - Cassa di Risparmio di Bolzano, UniCredit Bank, Cassa Rurale Alto Garda, Unicredit, Reiffeisen, Raiffeisenkasse Überetsch - Cassa Raiffeisen Oltradige, Raiffeisenkasse Tirol, Raiffeisenkasse Terlan, Raiffeisenkasse Tauferer-Ahrntal, Raiffeisenbank, Raiffeisen Bank, La Cassa Rurale, Euronet, Credito Valtellinese, Cassa Rurale Val di Sole, Banca Popolare di Sondrio] chargingStationOperators: [Alperia, Neogy, Alperia Smart Mobility, Enel, A22, bike-energy, Zeus, alperia, Dolomiti Energia, Alperia Smart Mobility Charging Station, Repower, Gemeinde Schlanders, Alperia - Dolomiti Energia, ACEA, evway, e-bike Villnöss, 'Tesla, Inc.', NEOGY, Jungmann - Wohnzentrum, Hotel Granbaita Dolomites, Gemeinde St. Vigil, Evway, Enel X, ENEL, ECO fuel, BikeBreak] officialLanguages: [it, de, lld] +parcelLockerBrand: [Amazon Hub, Amazon Locker] diff --git a/app/src/main/assets/country_metadata/IT-36.yml b/app/src/main/assets/country_metadata/IT-36.yml index dbfad363ce..262af36ee0 100644 --- a/app/src/main/assets/country_metadata/IT-36.yml +++ b/app/src/main/assets/country_metadata/IT-36.yml @@ -3,3 +3,4 @@ atmOperators: [Poste Italiane, Euronet, UniCredit Bank, Postamat, Intesa Sanpaol chargingStationOperators: [Repower, Enel X, Hera / AcegasApsAmga, Be Charge, Enel, Hera, Emobitaly, EVAD, 'Tesla, Inc.', Tesla Motors (Destination Charging), Plenitude, Là di Anselmi, Hera / AcegasApsAmga (EnelX)] clothesContainerOperators: [Caritas Diocesana, Caritas] officialLanguages: [it, fur, sl, de] +parcelLockerBrand: [Amazon Hub, Amazon Locker, InPost, Amazon] diff --git a/app/src/main/assets/country_metadata/IT-82.yml b/app/src/main/assets/country_metadata/IT-82.yml index 4c99ece8a2..507e773d47 100644 --- a/app/src/main/assets/country_metadata/IT-82.yml +++ b/app/src/main/assets/country_metadata/IT-82.yml @@ -3,3 +3,4 @@ additionalStreetsignLanguages: [scn] atmOperators: [Poste Italiane, Euronet, Unicredit, Monte dei Paschi di Siena, Euronet Worldwide, Banca Agricola Popolare di Ragusa, Intesa Sanpaolo, UniCredit Bank, Crédit Agricole, Credit Agricole, BPER Banca, Credito Siciliano, Credem, Banco di Sicilia, Banca di Credito Cooperativo del Belice, Banca di Credito Cooperativo G. Toniolo di S. Cataldo, Banca Popolare Sant'Angelo, BNL] chargingStationOperators: [Enel X Way, Enel X, Be Charge, Enel, EuroSpin, Duferco Energia, Scame, Driwe, BeCharge, enel, Ewiva, Parco Corolla, Lidl, Ionity, Eniwa, Circontrol] clothesContainerOperators: [Cannone srl, Cannone] +parcelLockerBrand: [Amazon Locker, Amazon Hub, InPost, Locker InPost] diff --git a/app/src/main/assets/country_metadata/IT.yml b/app/src/main/assets/country_metadata/IT.yml index fb2e3cb8fa..734bb98753 100644 --- a/app/src/main/assets/country_metadata/IT.yml +++ b/app/src/main/assets/country_metadata/IT.yml @@ -13,6 +13,7 @@ mobileCountryCode: 222 noParkingLineStyle: yellow-black on curb officialLanguages: [it] orchardProduces: [olive, grape, tomato, hazelnut, peach, apple, almond, chestnut, orange, cherry, pear, kiwi, lemon, lime, apricot, plum] +parcelLockerBrand: [Amazon Hub, Amazon Locker, InPost, Amazon Hub Locker, PuntoPoste, Locker InPost, Amazon] postboxesHaveCollectionTimes: true slowZoneLabelPosition: top slowZoneLabelText: zona diff --git a/app/src/main/assets/country_metadata/JP.yml b/app/src/main/assets/country_metadata/JP.yml index 415f898cb3..afa3d6e1e3 100644 --- a/app/src/main/assets/country_metadata/JP.yml +++ b/app/src/main/assets/country_metadata/JP.yml @@ -14,6 +14,7 @@ noParkingLineStyle: dashed yellow on curb noStoppingLineStyle: yellow on curb officialLanguages: [ja] orchardProduces: [tea, apple, persimmon, chestnut, grape, apricot, pear, tomato, peach, strawberry, cherry, chilli_pepper, sweet_pepper, plum, orange, kiwi] +parcelLockerBrand: [Amazon Hub ロッカー, プドー, Amazon Locker, PUDOステーション, はこぽす, PUDO, Tajimingo, amazon, Amazon Hub Locker] popularReligions: [shinto, buddhist, animist] popularSports: [tennis, baseball] postboxesHaveCollectionTimes: true diff --git a/app/src/main/assets/country_metadata/KZ.yml b/app/src/main/assets/country_metadata/KZ.yml index 7dd35d5018..cd0d67c8f9 100644 --- a/app/src/main/assets/country_metadata/KZ.yml +++ b/app/src/main/assets/country_metadata/KZ.yml @@ -7,5 +7,6 @@ livingStreetSignStyle: russia mobileCountryCode: 401 officialLanguages: [kk, ru] orchardProduces: [apple, tomato, grape, apricot, pear, plum, walnut, peach, strawberry, chilli_pepper, sweet_pepper, almond, cherry] +parcelLockerBrand: [Қазпошта] popularReligions: [muslim] postboxesHaveCollectionTimes: true diff --git a/app/src/main/assets/country_metadata/LT.yml b/app/src/main/assets/country_metadata/LT.yml index 71a24bce9c..9499ef5e24 100644 --- a/app/src/main/assets/country_metadata/LT.yml +++ b/app/src/main/assets/country_metadata/LT.yml @@ -15,4 +15,5 @@ noParkingLineStyle: dashed yellow noStoppingLineStyle: yellow officialLanguages: [lt] orchardProduces: [apple, raspberry, strawberry, pear, blueberry, plum, tomato, cherry] +parcelLockerBrand: [Omniva, LP Express, DPD, DPD Pickup Station, uDrop, Venipak, OMNIVA, Smartpost, Lietuvos Paštas, Omniva paštomatas, LP express paštomatas, LP EXPRESS] postboxesHaveCollectionTimes: true diff --git a/app/src/main/assets/country_metadata/LU.yml b/app/src/main/assets/country_metadata/LU.yml index 8fa1e9916e..5e8166b882 100644 --- a/app/src/main/assets/country_metadata/LU.yml +++ b/app/src/main/assets/country_metadata/LU.yml @@ -14,6 +14,7 @@ livingStreetSignStyle: vienna mobileCountryCode: 270 officialLanguages: [fr, de, lb] orchardProduces: [grape, apple, plum, pear, walnut, strawberry] +parcelLockerBrand: [POST Luxembourg] postboxesHaveCollectionTimes: true slowZoneLabelPosition: top slowZoneLabelText: ZONE diff --git a/app/src/main/assets/country_metadata/LV.yml b/app/src/main/assets/country_metadata/LV.yml index 3e50146eed..a97f1ad41b 100644 --- a/app/src/main/assets/country_metadata/LV.yml +++ b/app/src/main/assets/country_metadata/LV.yml @@ -17,6 +17,7 @@ noParkingLineStyle: dashed yellow noStoppingLineStyle: yellow officialLanguages: [lv] orchardProduces: [apple, blueberry, strawberry, raspberry, pear, plum] +parcelLockerBrand: [Omniva, Smartpost, DPD, Latvijas Pasts, Itella, DPD Pickup Station, Venipak] postboxesHaveCollectionTimes: true slowZoneLabelPosition: bottom slowZoneLabelText: ZONA diff --git a/app/src/main/assets/country_metadata/MX.yml b/app/src/main/assets/country_metadata/MX.yml index 210a123f16..003a99858f 100644 --- a/app/src/main/assets/country_metadata/MX.yml +++ b/app/src/main/assets/country_metadata/MX.yml @@ -12,5 +12,6 @@ noParkingSignStyle: mutcd latin noStoppingSignStyle: mutcd officialLanguages: [es] orchardProduces: [coffee, orange, avocado, guava, mango, mangosteen, lemon, lime, chilli_pepper, sweet_pepper, coconut, walnut, tomato, banana, cacao, apple, grape, rubber, peach] +parcelLockerBrand: [Amazon Hub] popularSports: [soccer, basketball, baseball, tennis] workweekDays: 6 diff --git a/app/src/main/assets/country_metadata/NL.yml b/app/src/main/assets/country_metadata/NL.yml index 7198769291..b75f507e8a 100644 --- a/app/src/main/assets/country_metadata/NL.yml +++ b/app/src/main/assets/country_metadata/NL.yml @@ -15,6 +15,7 @@ noParkingLineStyle: dashed yellow noStoppingLineStyle: yellow officialLanguages: [nl] orchardProduces: [pear, apple, tomato, strawberry, chilli_pepper, sweet_pepper, blueberry, plum, raspberry, cherry, grape] +parcelLockerBrand: [PostNL, DHL, DHL Packstation, de Buren, Hub, Budbee, MyPup, DHL Parcelstation] popularReligions: [christian, muslim, jewish] popularSports: [soccer, tennis, equestrian, basketball, field_hockey] postboxesHaveCollectionTimes: true diff --git a/app/src/main/assets/country_metadata/NO.yml b/app/src/main/assets/country_metadata/NO.yml index ceb89cde2a..71257f8128 100644 --- a/app/src/main/assets/country_metadata/NO.yml +++ b/app/src/main/assets/country_metadata/NO.yml @@ -14,6 +14,7 @@ livingStreetSignStyle: vienna mobileCountryCode: 242 officialLanguages: [nb, nn, no] orchardProduces: [apple, strawberry, plum, raspberry, cherry, pear, tomato, blueberry] +parcelLockerBrand: [Posten, PostNord, Pakkeboks] postboxesHaveCollectionTimes: true slowZoneLabelPosition: top slowZoneLabelText: Sone diff --git a/app/src/main/assets/country_metadata/PL.yml b/app/src/main/assets/country_metadata/PL.yml index 2602d0c74c..9ac365200d 100644 --- a/app/src/main/assets/country_metadata/PL.yml +++ b/app/src/main/assets/country_metadata/PL.yml @@ -13,6 +13,7 @@ livingStreetSignStyle: vienna mobileCountryCode: 260 officialLanguages: [pl] orchardProduces: [apple, strawberry, cherry, raspberry, plum, tomato, blueberry, pear, hazelnut, chilli_pepper, sweet_pepper, walnut, hop, peach, apricot, grape] +parcelLockerBrand: [Paczkomat InPost, Allegro One Box, Orlen Paczka, DPD Pickup Station, DHL Pop Box, AliExpress, DPD, Allegro, InPost, DHL POP BOX, DHL, Orlen] popularSports: [soccer, athletics, volleyball, basketball, handball, tennis] postboxesHaveCollectionTimes: true regularShoppingDays: 5 diff --git a/app/src/main/assets/country_metadata/PT.yml b/app/src/main/assets/country_metadata/PT.yml index ea8f0f152a..375f171678 100644 --- a/app/src/main/assets/country_metadata/PT.yml +++ b/app/src/main/assets/country_metadata/PT.yml @@ -11,6 +11,7 @@ noParkingLineStyle: dashed yellow noStoppingLineStyle: yellow officialLanguages: [pt] orchardProduces: [olive, grape, chestnut, almond, orange, tomato, apple, pear, walnut, fig, peach, kiwi, blueberry, avocado, plum] +parcelLockerBrand: [Locky CTT, Locky] popularReligions: [christian, jewish, muslim] postboxesHaveCollectionTimes: true slowZoneLabelPosition: top diff --git a/app/src/main/assets/country_metadata/RO.yml b/app/src/main/assets/country_metadata/RO.yml index 962b45acc0..2e2f957e73 100644 --- a/app/src/main/assets/country_metadata/RO.yml +++ b/app/src/main/assets/country_metadata/RO.yml @@ -11,6 +11,7 @@ livingStreetSignStyle: vienna mobileCountryCode: 226 officialLanguages: [ro] orchardProduces: [grape, plum, apple, tomato, chilli_pepper, sweet_pepper, strawberry, pear, cherry, apricot, walnut, peach, hazelnut, blueberry, hop, raspberry] +parcelLockerBrand: [easybox, FANbox, GLS, Ship & Go, EasyBox, DPD Pickup Station, Sameday Easybox, Cargus] popularSports: [soccer, tennis, basketball, handball] postboxesHaveCollectionTimes: true slowZoneLabelPosition: bottom diff --git a/app/src/main/assets/country_metadata/RS-VO.yml b/app/src/main/assets/country_metadata/RS-VO.yml index be0c60c43c..7871d3bb90 100644 --- a/app/src/main/assets/country_metadata/RS-VO.yml +++ b/app/src/main/assets/country_metadata/RS-VO.yml @@ -2,3 +2,4 @@ atmOperators: [OTP Bank, Banca Intesa, Raiffeisen bank, Поштанска штедионица, UniCredit Bank, Erste Bank, NLB, Eurobank, AIK banka, Банка Поштанска штедионица, Société Générale, NLB Komercijalna banka, Mobi banka, Erste bank, Addiko Bank, AIK Banka] chargingStationOperators: [Газпром] officialLanguages: [sr, hu, hr, sk, ro, rsk] +parcelLockerBrand: [Поштин пакетомат] diff --git a/app/src/main/assets/country_metadata/RS.yml b/app/src/main/assets/country_metadata/RS.yml index 0bd006938c..194f0b1a74 100644 --- a/app/src/main/assets/country_metadata/RS.yml +++ b/app/src/main/assets/country_metadata/RS.yml @@ -11,6 +11,7 @@ noParkingLineStyle: dashed yellow with Xs noStoppingLineStyle: yellow officialLanguages: [sr] orchardProduces: [plum, apple, raspberry, grape, cherry, tomato, peach, strawberry, apricot, chilli_pepper, sweet_pepper, pear, hazelnut, walnut, hop] +parcelLockerBrand: [Поштин Пакетомат] postboxesHaveCollectionTimes: true slowZoneLabelPosition: bottom slowZoneLabelText: ЗОНА diff --git a/app/src/main/assets/country_metadata/RU-AD.yml b/app/src/main/assets/country_metadata/RU-AD.yml index c92733b292..15e0b782aa 100644 --- a/app/src/main/assets/country_metadata/RU-AD.yml +++ b/app/src/main/assets/country_metadata/RU-AD.yml @@ -1,3 +1,4 @@ # Do not edit. Data is from res/country/metadata and https://github.com/streetcomplete/countrymetadata atmOperators: [ПАО Сбербанк, Кубань Кредит, Банк ВТБ (ПАО), Россельхозбанк, Промсвязьбанк, ВБРР] officialLanguages: [ru, ady] +parcelLockerBrand: [Почта России] diff --git a/app/src/main/assets/country_metadata/RU-ME.yml b/app/src/main/assets/country_metadata/RU-ME.yml index b2d536a199..ec5b17ac35 100644 --- a/app/src/main/assets/country_metadata/RU-ME.yml +++ b/app/src/main/assets/country_metadata/RU-ME.yml @@ -1,3 +1,4 @@ # Do not edit. Data is from res/country/metadata and https://github.com/streetcomplete/countrymetadata atmOperators: [Сбербанк, ПАО Сбербанк, ПАО "АК БАРС" БАНК, Банк ВТБ (ПАО), Россельхозбанк, Открытие, ВТБ] officialLanguages: [ru, chm] +parcelLockerBrand: [Ozon] diff --git a/app/src/main/assets/country_metadata/RU-TA.yml b/app/src/main/assets/country_metadata/RU-TA.yml index bedf1643a9..23de4f72cb 100644 --- a/app/src/main/assets/country_metadata/RU-TA.yml +++ b/app/src/main/assets/country_metadata/RU-TA.yml @@ -2,3 +2,4 @@ atmOperators: [ПАО "АК БАРС" БАНК, ПАО Сбербанк, Сбербанк, Аверс, АО "Альфа-Банк", АО "Тинькофф Банк", ВТБ, Банк ВТБ (ПАО), ПАО «Банк Зенит», Промсвязьбанк, Ак Барс Банк, Татсоцбанк, АО "Райффайзенбанк", Газпромбанк, Банк ЗЕНИТ, Россельхозбанк, ПАО РОСБАНК, ПАО Банк "ФК Открытие", Банк Казани, Альфа-Банк, АО "Кредит Европа Банк (Россия)", Авангард, Райффайзен, РГС Банк, Открытие, Почта Банк, АвтоГрадБанк, АО "Татсоцбанк", Энергобанк, Уралсиб, Русский Стандарт, ПАО "БАНК УРАЛСИБ", ООО КБЭР "Банк Казани", Бевонкредит, Автоградбанк, Росбанк, ПАО «АК БАРС» БАНК, ИК банк, Банк ГПБ (АО), Акибанк, Аверс Банк, АО "Автоградбанк", АК БАРС БАНК] chargingStationOperators: [АО "Сетевая компания", Татнефть, АО «Сетевая компания», Сетевая компания] officialLanguages: [ru, tt] +parcelLockerBrand: [Ozon box, Почта России, Cainiao, Яндекс.Маркет, Сберлогистика, 5post, Ozon Box, Халва, PickPoint, ОмниСДЭК, Ozon, Fivepost, AliExpress;Cainiao] diff --git a/app/src/main/assets/country_metadata/RU.yml b/app/src/main/assets/country_metadata/RU.yml index 82141aca99..e1704d1951 100644 --- a/app/src/main/assets/country_metadata/RU.yml +++ b/app/src/main/assets/country_metadata/RU.yml @@ -16,6 +16,7 @@ noParkingLineStyle: dashed yellow noStoppingLineStyle: yellow officialLanguages: [ru] orchardProduces: [apple, tomato, grape, plum, strawberry, raspberry, apricot, cherry, pear, peach, blueberry, tea, hop, orange] +parcelLockerBrand: [Ozon Box, PickPoint, Ozon box, Почта России, 5post, ОмниСДЭК, Халва, Яндекс.Маркет, Cainiao, СберЛогистика, Ozon, СДЭК, 5Post, Qiwi, Цайняо, Яндекс Маркет, Утконос, Wildberries, fivepost.ru, QIWI, OZON, InPost, Aliexpress, AliExpress] popularSports: [soccer, basketball, tennis, field_hockey, volleyball, ice_hockey] postboxesHaveCollectionTimes: true slowZoneLabelPosition: top diff --git a/app/src/main/assets/country_metadata/SE.yml b/app/src/main/assets/country_metadata/SE.yml index 7e7384e92a..0bdcfe39e2 100644 --- a/app/src/main/assets/country_metadata/SE.yml +++ b/app/src/main/assets/country_metadata/SE.yml @@ -15,6 +15,7 @@ noParkingLineStyle: dashed yellow noStoppingLineStyle: yellow officialLanguages: [sv] orchardProduces: [strawberry, apple, raspberry, pear, grape, tomato, plum, blueberry, cherry] +parcelLockerBrand: [Instabox, PostNord, Budbee, Paketbox, iBoxen, Postnord, PostNord Paketbox] popularSports: [soccer, tennis, basketball, golf, boules, equestrian, ice_hockey] postboxesHaveCollectionTimes: true regularShoppingDays: 5 diff --git a/app/src/main/assets/country_metadata/SG.yml b/app/src/main/assets/country_metadata/SG.yml index d4eb796b46..3ad9f7fea3 100644 --- a/app/src/main/assets/country_metadata/SG.yml +++ b/app/src/main/assets/country_metadata/SG.yml @@ -10,6 +10,7 @@ noStandingLineStyle: yellow zig-zags noStoppingLineStyle: double yellow zig-zags officialLanguages: [en, ms, zh, ta] orchardProduces: [coconut, tomato] +parcelLockerBrand: [Pick, POPStation] popularReligions: [buddhist, christian, muslim, chinese_folk, taoist, hindu] postboxesHaveCollectionTimes: true postboxesHaveRef: true diff --git a/app/src/main/assets/country_metadata/SI.yml b/app/src/main/assets/country_metadata/SI.yml index 8acbe745f0..7d207a5266 100644 --- a/app/src/main/assets/country_metadata/SI.yml +++ b/app/src/main/assets/country_metadata/SI.yml @@ -16,6 +16,7 @@ noParkingLineStyle: yellow zig-zags noStoppingLineStyle: yellow officialLanguages: [sl] orchardProduces: [grape, apple, hop, olive, walnut, peach, tomato, pear, chilli_pepper, sweet_pepper, hazelnut, strawberry, apricot, blueberry, plum, raspberry] +parcelLockerBrand: [GLS, PS Paketomat, DPD] popularReligions: [christian, muslim] popularSports: [soccer, basketball, tennis, golf, boules, equestrian] postboxesHaveCollectionTimes: true diff --git a/app/src/main/assets/country_metadata/SK.yml b/app/src/main/assets/country_metadata/SK.yml index 1241b8fd3d..9d9b29f656 100644 --- a/app/src/main/assets/country_metadata/SK.yml +++ b/app/src/main/assets/country_metadata/SK.yml @@ -11,6 +11,7 @@ livingStreetSignStyle: vienna mobileCountryCode: 231 officialLanguages: [sk] orchardProduces: [grape, apple, walnut, plum, tomato, peach, strawberry, chilli_pepper, sweet_pepper, apricot, hop, pear, blueberry, cherry, raspberry] +parcelLockerBrand: [Packeta, AlzaBox, BalíkoBOX, GLS Balíkomat, GLS, Z-BOX, Penguin Box, Dr. Max, Direct4me, Balíkomat] postboxesHaveCollectionTimes: true postboxesHaveRef: true slowZoneLabelPosition: top diff --git a/app/src/main/assets/country_metadata/TW.yml b/app/src/main/assets/country_metadata/TW.yml index bf2d74e56a..41339bf7ba 100644 --- a/app/src/main/assets/country_metadata/TW.yml +++ b/app/src/main/assets/country_metadata/TW.yml @@ -11,6 +11,7 @@ noParkingSignStyle: taiwan noStoppingSignStyle: vienna officialLanguages: [zh] orchardProduces: [areca_nut, guava, mango, mangosteen, banana, tea, pineapple, pear, persimmon, orange, grapefruit, tomato, apricot, papaya, lemon, lime, grape, chilli_pepper, sweet_pepper] +parcelLockerBrand: [i郵箱] popularReligions: [chinese_folk, taoist, buddhist, christian] popularSports: [basketball, tennis, volleyball, baseball] postboxesHaveCollectionTimes: true diff --git a/app/src/main/assets/country_metadata/UA.yml b/app/src/main/assets/country_metadata/UA.yml index df0ddada83..56455d42ee 100644 --- a/app/src/main/assets/country_metadata/UA.yml +++ b/app/src/main/assets/country_metadata/UA.yml @@ -15,6 +15,7 @@ noParkingLineStyle: dashed yellow noStoppingLineStyle: yellow officialLanguages: [uk, ru] orchardProduces: [apple, tomato, grape, plum, chilli_pepper, sweet_pepper, walnut, pear, cherry, strawberry, apricot, raspberry, peach, hop, hazelnut, blueberry] +parcelLockerBrand: [Нова Пошта, Нова пошта, Meest, Rozetka] popularReligions: [christian, muslim, jewish] postboxesHaveCollectionTimes: true slowZoneLabelPosition: top diff --git a/app/src/main/assets/country_metadata/US-AZ.yml b/app/src/main/assets/country_metadata/US-AZ.yml index 8da2896bd3..d29a748c4d 100644 --- a/app/src/main/assets/country_metadata/US-AZ.yml +++ b/app/src/main/assets/country_metadata/US-AZ.yml @@ -2,3 +2,4 @@ atmOperators: [Wells Fargo, Bank of America, Athena Bitcoin, Chase, Bitstop, U.S. Bank, MetaBank, RockItCoin, Desert Financial, BMO Harris Bank, Arizona Central Credit Union, Allpoint, AZ Federal Credit Union] chargingStationOperators: [Blink, 'Tesla, Inc.', ChargePoint, Electrify America, Volta, Tesla Motors, EVgo, eVgo, Tesla, Lowell Observatory, APS] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Hub, Amazon Locker] diff --git a/app/src/main/assets/country_metadata/US-CA.yml b/app/src/main/assets/country_metadata/US-CA.yml index 86f3a0e221..442665e27a 100644 --- a/app/src/main/assets/country_metadata/US-CA.yml +++ b/app/src/main/assets/country_metadata/US-CA.yml @@ -4,3 +4,4 @@ chargingStationOperators: [ChargePoint, 'Tesla, Inc.', Electrify America, EVgo, clothesContainerOperators: [Disabled American Veterans, USAgain] defaultSpeedLimitHasUrbanOrRural: true noStoppingLineStyle: red on curb +parcelLockerBrand: [Amazon Hub, Amazon Locker, Amazon Hub Locker] diff --git a/app/src/main/assets/country_metadata/US-CO.yml b/app/src/main/assets/country_metadata/US-CO.yml index 758d3e9406..f499bfb797 100644 --- a/app/src/main/assets/country_metadata/US-CO.yml +++ b/app/src/main/assets/country_metadata/US-CO.yml @@ -2,3 +2,4 @@ atmOperators: [Wells Fargo, Chase, First Bank, KeyBank, U.S. Bank, Huntington Bank, Bank of the West, Ent Credit Union, Canvas Credit Union, Bank of America, BBVA, FNBO, Bank of Colorado, Academy Bank, Western Union, Vectra Bank, University of Colorado Colorado Springs, UMB Bank, Security Service, Public Service Credit Union, PNC Bank, North Valley Bank, First National Bank, Elevations Credit Union, Credit Union of Colorado, Community Banks of Colorado, Citibank, CardTronics, BMO] chargingStationOperators: [ChargePoint, 'Tesla, Inc.', Electrify America, Blink, EVgo, eVgo, Hampton Inn, Volta, Regis University, rivian, Schneider Electric, City of Boulder] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Locker, Amazon Hub] diff --git a/app/src/main/assets/country_metadata/US-DC.yml b/app/src/main/assets/country_metadata/US-DC.yml index 5f2d6bc15c..a7ae6a8440 100644 --- a/app/src/main/assets/country_metadata/US-DC.yml +++ b/app/src/main/assets/country_metadata/US-DC.yml @@ -2,3 +2,4 @@ atmOperators: [Bank of America, PNC Bank, Wells Fargo, Chase, Truist, Citibank, Capital One, BB&T] chargingStationOperators: [ChargePoint, 'Tesla, Inc.'] defaultSpeedLimitHasUrbanOrRural: false +parcelLockerBrand: [Amazon Hub] diff --git a/app/src/main/assets/country_metadata/US-FL.yml b/app/src/main/assets/country_metadata/US-FL.yml index 16d6aebaa4..51534c772f 100644 --- a/app/src/main/assets/country_metadata/US-FL.yml +++ b/app/src/main/assets/country_metadata/US-FL.yml @@ -2,3 +2,4 @@ atmOperators: [Chase, Wells Fargo, Bank of America, Truist, SunTrust, Publix, Fifth Third Bank, Citibank, PNC Bank, Presto!, ATM, iTHINK Financial, TD Bank, Athena Bitcoin, VyStar, Tyndall Federal Credit Union, Tampa Bay Federal Credit Union, Suncoast Credit Union, Regions Bank, Centennial Bank, Arco Globus Vending LLC, Allpoint, Synovus, PenFed Credit Union, Partners Federal Credit Union, FNBT, Community First Credit Union, Athena Bitcoin Inc.] chargingStationOperators: ['Tesla, Inc.', Electrify America, ChargePoint, Duke Energy, Blink, Shell Recharge Solutions, adstec, Tesla Motors, Seaside, Clipper Creek, Whole Foods, Publix, EVgo, 7-Eleven] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Hub, Amazon Hub Locker, Amazon Locker] diff --git a/app/src/main/assets/country_metadata/US-GA.yml b/app/src/main/assets/country_metadata/US-GA.yml index 2570a46dad..36254ee96b 100644 --- a/app/src/main/assets/country_metadata/US-GA.yml +++ b/app/src/main/assets/country_metadata/US-GA.yml @@ -3,3 +3,4 @@ atmOperators: [Bank of America, Wells Fargo, Publix, PNC Bank, Truist, SunTrust, chargingStationOperators: [Electrify America, ChargePoint, Georgia Power, 'Tesla, Inc.', Volta, eVgo, Tesla, Whole Foods, NRG Energy, Middle Georgia State University, Georgia College, EVgo, Cobb EMC, City of Thomasville, Blink] clothesContainerOperators: [Green Zone Recycling] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Hub, Amazon Locker] diff --git a/app/src/main/assets/country_metadata/US-IL.yml b/app/src/main/assets/country_metadata/US-IL.yml index a47f61746a..134b6fea70 100644 --- a/app/src/main/assets/country_metadata/US-IL.yml +++ b/app/src/main/assets/country_metadata/US-IL.yml @@ -2,3 +2,4 @@ atmOperators: [Bank of America, Chase, BMO, CEFCU, PNC Bank, Fifth Third Bank, Bitcoin Depot, U.S. Bank, Citibank, Circle K, Huntington Bank, Busey Bank, Bitcoin of America, Bank of Springfield, Road Ranger, Regions Bank, Old National Bank, Morton Community Bank, Triton, Old Second National Bank, INB, Hyde Park Bank, Banterra Bank, Athena Bitcoin Inc.] chargingStationOperators: ['Tesla, Inc.', ChargePoint, Volta, Electrify America, EVgo, Blink, Tesla, NRG Energy, iGo, Bradley University] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Hub] diff --git a/app/src/main/assets/country_metadata/US-MA.yml b/app/src/main/assets/country_metadata/US-MA.yml index 88db557c22..a4ee323ff6 100644 --- a/app/src/main/assets/country_metadata/US-MA.yml +++ b/app/src/main/assets/country_metadata/US-MA.yml @@ -2,3 +2,4 @@ atmOperators: [Bank of America, Santander, Citizens Bank, TD Bank, Chase, Florence Savings Bank, Cambridge Savings Bank, Shrewsbury Federal Credit Union, MIT Federal Credit Union, Eastern Bank, Digital Credit Union] chargingStationOperators: [ChargePoint, 'Tesla, Inc.', Volta, Tesla Motors, Electrify America, EVgo, eVgo, Town of Bolton] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Hub] diff --git a/app/src/main/assets/country_metadata/US-MD.yml b/app/src/main/assets/country_metadata/US-MD.yml index 4253c91581..826240370d 100644 --- a/app/src/main/assets/country_metadata/US-MD.yml +++ b/app/src/main/assets/country_metadata/US-MD.yml @@ -4,3 +4,4 @@ chargingStationOperators: [ChargePoint, 'Tesla, Inc.', Volta, Blink, EVgo, BGE, clothesContainerOperators: [Planet Aid, JJ Recycling] defaultSpeedLimitHasUrbanOrRural: true noStoppingLineStyle: yellow on curb +parcelLockerBrand: [Amazon Hub, Amazon Locker] diff --git a/app/src/main/assets/country_metadata/US-MO.yml b/app/src/main/assets/country_metadata/US-MO.yml index 25884bf7e1..b3a3a8a4bb 100644 --- a/app/src/main/assets/country_metadata/US-MO.yml +++ b/app/src/main/assets/country_metadata/US-MO.yml @@ -2,3 +2,4 @@ atmOperators: [Commerce Bank, U.S. Bank, Bank of America, Bank of Washington, US Bank, Great Southern Bank, Regions Bank, First Bank, United Bank of Union, PNC Bank, Chase, Bank of Sullivan, UMB Bank, UMB, Reliance Bank, Citizens Bank, Bank of Franklin County, Bank Midwest, Arvest, Academy Bank] chargingStationOperators: [ChargePoint, 'Tesla, Inc.', Evergy, Tesla Motors] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Locker] diff --git a/app/src/main/assets/country_metadata/US-NC.yml b/app/src/main/assets/country_metadata/US-NC.yml index 5e2b73a251..103f9c2f87 100644 --- a/app/src/main/assets/country_metadata/US-NC.yml +++ b/app/src/main/assets/country_metadata/US-NC.yml @@ -2,3 +2,4 @@ atmOperators: [Cash Points, Bank of America, Wells Fargo, State Employees Credit Union, CashPoints® ATM, Pay Depot, PNC Bank, State Employees' Credit Union, Cash Points ATM, Cash Points (ATM), SunTrust, State Employee's Credit Union (ATM), Local Government Federal Credit Union, Cashpoints, BB&T, Truist, State Employees Credit Union (ATM), Fifth Third Bank, State Employee's Credit Union, State Employee Credit Union (ATM), First Citizens Bank, Chase, Allpoint, Allegacy, State Employees' Credit Union (ATM), North Carolina State Employees' Credit Union, NC State Employees' Credit Union, NC State Employees Credit Union, Cashpoint, CashPoints] chargingStationOperators: [ChargePoint, 'Tesla, Inc.', SAS, Electrify America, Blink, Tesla Motors, North Carolina Division of Parks & Recreation, City of Raleigh] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Locker] diff --git a/app/src/main/assets/country_metadata/US-NJ.yml b/app/src/main/assets/country_metadata/US-NJ.yml index 4586215a1a..fa5477f20e 100644 --- a/app/src/main/assets/country_metadata/US-NJ.yml +++ b/app/src/main/assets/country_metadata/US-NJ.yml @@ -3,3 +3,4 @@ atmOperators: [Pay Depot, Bank of America, PNC Bank, Chase, Valley Bank ATM, Lib chargingStationOperators: ['Tesla, Inc.', ChargePoint, Tesla Motors, EVgo, Blink, Volta, Glen Rock, Electrify America] clothesContainerOperators: [The ClothesLine] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Hub, Amazon Hub Locker] diff --git a/app/src/main/assets/country_metadata/US-NV.yml b/app/src/main/assets/country_metadata/US-NV.yml index 913754d6bc..5ffa8cb52e 100644 --- a/app/src/main/assets/country_metadata/US-NV.yml +++ b/app/src/main/assets/country_metadata/US-NV.yml @@ -2,3 +2,4 @@ atmOperators: [Wells Fargo, Bank of America, Nevada State Bank, U.S. Bank] chargingStationOperators: ['Tesla, Inc.', ChargePoint, Electrify America, Tesla, Unknown, Tesla Motors, Shell Recharge Solutions] defaultSpeedLimitHasUrbanOrRural: false +parcelLockerBrand: [Amazon Hub, Amazon Locker] diff --git a/app/src/main/assets/country_metadata/US-NY.yml b/app/src/main/assets/country_metadata/US-NY.yml index b120a03a56..acd501253c 100644 --- a/app/src/main/assets/country_metadata/US-NY.yml +++ b/app/src/main/assets/country_metadata/US-NY.yml @@ -3,3 +3,4 @@ atmOperators: [Bank of America, Chase, Citibank, M&T Bank, KeyBank, Santander, P chargingStationOperators: [ChargePoint, 'Tesla, Inc.', Tesla Motors, Volta, National Grid, EV Connect, Blink, FLO, EvolveNY, Electrify America, Whole Foods, TownePlace Suites, Town of Penfield, NYC Department of Parks and Creation, IBM, Holiday Inn Express, Griffiss Utilities] clothesContainerOperators: [National Cancer Center, Hearts for the Homeless] defaultSpeedLimitHasUrbanOrRural: false +parcelLockerBrand: [Amazon Hub, Amazon Locker, Amazon Hub Locker] diff --git a/app/src/main/assets/country_metadata/US-OH.yml b/app/src/main/assets/country_metadata/US-OH.yml index 0a4315384b..70d385097f 100644 --- a/app/src/main/assets/country_metadata/US-OH.yml +++ b/app/src/main/assets/country_metadata/US-OH.yml @@ -3,3 +3,4 @@ atmOperators: [American Crypto, PNC Bank, Fifth Third Bank, Huntington Bank, Key chargingStationOperators: ['Tesla, Inc.', ChargePoint, Tesla Motors, Electrify America, Shell, Bowling Green State University, Kent State University, latitude apartments, University of Cincinnati, Miami University, Easton Town Center] clothesContainerOperators: [Planet Aid, Paralyzed Veterans of America] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Hub, Amazon Locker] diff --git a/app/src/main/assets/country_metadata/US-OK.yml b/app/src/main/assets/country_metadata/US-OK.yml index f4c9ec6f17..0d96bedb95 100644 --- a/app/src/main/assets/country_metadata/US-OK.yml +++ b/app/src/main/assets/country_metadata/US-OK.yml @@ -2,3 +2,4 @@ atmOperators: [Chase, Arvest Bank, IBC Bank, Bank of Oklahoma, Bank of America, MidFirst Bank, BancFirst, Arvest] chargingStationOperators: ['Tesla, Inc.', Tesla Motors] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Hub] diff --git a/app/src/main/assets/country_metadata/US-OR.yml b/app/src/main/assets/country_metadata/US-OR.yml index 615201b401..9ffabef284 100644 --- a/app/src/main/assets/country_metadata/US-OR.yml +++ b/app/src/main/assets/country_metadata/US-OR.yml @@ -3,3 +3,4 @@ atmOperators: [Wells Fargo, U.S. Bank, Chase, Bank of America, Umpqua Bank, OnPo chargingStationOperators: [ChargePoint, Blink, 'Tesla, Inc.', Electrify America, Volta, EVCS, Portland General Electric, EVgo, Chargepoint, Rivian, AeroVironment, eVgo, OpConnect, Holiday Inn Express & Suites Portland Airport - Cascade Station, Church Extension Plan] clothesContainerOperators: [Gemtext, Gaia Movement USA] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Hub, Amazon Locker] diff --git a/app/src/main/assets/country_metadata/US-PA.yml b/app/src/main/assets/country_metadata/US-PA.yml index bde9727b78..555bb33bb7 100644 --- a/app/src/main/assets/country_metadata/US-PA.yml +++ b/app/src/main/assets/country_metadata/US-PA.yml @@ -3,3 +3,4 @@ atmOperators: [PNC Bank, American Crypto, Wells Fargo, Pay Depot, Bank of Americ chargingStationOperators: ['Tesla, Inc.', ChargePoint, Volta, Blink, Electrify America, eVgo, EVgo, Whole Foods, Tru by Hilton Chambersburg, 'Tesla, Inc'] clothesContainerOperators: [USAgain] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Hub, Amazon Locker, Amazon Hub Locker] diff --git a/app/src/main/assets/country_metadata/US-SC.yml b/app/src/main/assets/country_metadata/US-SC.yml index 67ae5a0663..bf30344fcb 100644 --- a/app/src/main/assets/country_metadata/US-SC.yml +++ b/app/src/main/assets/country_metadata/US-SC.yml @@ -3,3 +3,4 @@ atmOperators: [Wells Fargo, Bank of America, Truist, First Citizens Bank, Palmet chargingStationOperators: ['Tesla, Inc.', ChargePoint, Blink, City of Greenville] clothesContainerOperators: [There Is Hope, Green Zone] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Hub] diff --git a/app/src/main/assets/country_metadata/US-TN.yml b/app/src/main/assets/country_metadata/US-TN.yml index cc253e5548..1127d7cbe1 100644 --- a/app/src/main/assets/country_metadata/US-TN.yml +++ b/app/src/main/assets/country_metadata/US-TN.yml @@ -2,3 +2,4 @@ atmOperators: [Bank of America, SunTrust, Regions, Regions Bank, Fifth Third Bank, Heritage Bank, ORNL Federal Credit Union, Fort Campbell Federal Credit Union, First Horizon Bank, Eastman Credit Union] chargingStationOperators: [ChargePoint, 'Tesla, Inc.', NRG Energy, Blink, Electrify America] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Locker] diff --git a/app/src/main/assets/country_metadata/US-TX.yml b/app/src/main/assets/country_metadata/US-TX.yml index 9e3a71bee5..970053de90 100644 --- a/app/src/main/assets/country_metadata/US-TX.yml +++ b/app/src/main/assets/country_metadata/US-TX.yml @@ -3,3 +3,4 @@ atmOperators: [Bank of America, Chase, Wells Fargo, Capital One, USAA, Frost Ban chargingStationOperators: [ChargePoint, 'Tesla, Inc.', Volta, Austin Energy, Blink, EVgo, NRG Energy, Tesla Motors, Tesla, Holiday Inn Express and Suites Amarillo West – Tesla Destination, BEC, Vitesco Technologies, Hampton Inn & Suites Amarillo East - Tesla Destination, Electrify America, BMW, eVgo, ZEF, Hyatt Place Dallas/Allen - Tesla Destination, Hilton Garden Inn Tesla Destination, Globe Life Park in Arlington, Cinemark Allen 16 & XD] clothesContainerOperators: [Arms of Hope] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Hub Locker, Amazon Hub, Amazon Locker] diff --git a/app/src/main/assets/country_metadata/US-VA.yml b/app/src/main/assets/country_metadata/US-VA.yml index fab6bb2668..084f01503e 100644 --- a/app/src/main/assets/country_metadata/US-VA.yml +++ b/app/src/main/assets/country_metadata/US-VA.yml @@ -2,3 +2,4 @@ atmOperators: [Wells Fargo, American Crypto, Bank of America, PNC Bank, Truist, Navy Federal Credit Union, BB&T, SunTrust, Capital One, MetaBank, Citibank, Venco, Chase, Woodforest National Bank, First National Bank, Allpoint, Wachovia, Union Bank, USAA, 'FCTI, Inc.', Euronet, Cardtronics, Blue Eagle Credit Union, Atlantic Union Bank] chargingStationOperators: ['Tesla, Inc.', ChargePoint, Volta, EVgo, Electrify America, Blink, 7-Eleven, eVgo, Libbie Mill, Corporate Research Center, Refuge Inn] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Hub] diff --git a/app/src/main/assets/country_metadata/US-WA.yml b/app/src/main/assets/country_metadata/US-WA.yml index a1b557177d..9a29191528 100644 --- a/app/src/main/assets/country_metadata/US-WA.yml +++ b/app/src/main/assets/country_metadata/US-WA.yml @@ -3,3 +3,4 @@ atmOperators: [Bank of America, Chase, Wells Fargo, BECU, U.S. Bank, KeyBank, Ci chargingStationOperators: [Volta, ChargePoint, Blink, Electrify America, 'Tesla, Inc.', eVgo, EVgo, University of Washington, Shell Recharge Solutions, NRG Energy, Tesla, GE, volta, FLO, City of Seattle, Bellingham Nissan, Avista, AV aerovironment] clothesContainerOperators: [USAgain, TexGreen] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Hub, Amazon Locker, Amazon] diff --git a/app/src/main/assets/country_metadata/US-WI.yml b/app/src/main/assets/country_metadata/US-WI.yml index 5e75db7640..a08124ed22 100644 --- a/app/src/main/assets/country_metadata/US-WI.yml +++ b/app/src/main/assets/country_metadata/US-WI.yml @@ -3,3 +3,4 @@ additionalValidHousenumberRegex: ^([NSEW][0-9]{1,5}[ -]?){1,2}[A-Z]?$ atmOperators: [UW Credit Union, U.S. Bank, Chase, BMO, Wells Fargo, Associated Bank, US Bank, North Shore Bank, Cash Depot, Town Bank, PNC Bank, Old National Bank, Metabank, Huntington Bank, Educators Credit Union, BMO Harris] chargingStationOperators: [ChargePoint, 'Tesla, Inc.', Electrify America, Blink, University of Wisconsin-Stevens Point, Stevens Point Hyundai, Mid-State Technical College, Madison Gas & Electric Company, Barnwood Events] defaultSpeedLimitHasUrbanOrRural: true +parcelLockerBrand: [Amazon Hub] diff --git a/app/src/main/assets/country_metadata/UZ-QR.yml b/app/src/main/assets/country_metadata/UZ-QR.yml index 8e4f071d99..d1b09445bc 100644 --- a/app/src/main/assets/country_metadata/UZ-QR.yml +++ b/app/src/main/assets/country_metadata/UZ-QR.yml @@ -1,3 +1,4 @@ # Do not edit. Data is from res/country/metadata and https://github.com/streetcomplete/countrymetadata atmOperators: [UZCARD;HUMO, Хорезмский региональный офис банковских услуг, UZCARD;HUMO - AGROBANK, Mikrokreditbank, Центр банковских услуг "Тахиатош", Каракалпакский региональный офис банковских услуг, Xalq Bank, UZCARD;HUMO - O'ZSANOATQURILISHBANK, KAPITAL BANK, Xalq banki, Xalq bank, VISA;MIR;UZCARD;HUMO - KAPITAL BANK, UZCARD;HUMO - XALQBANK, UZCARD;HUMO - TURON BANK, UZCARD;HUMO - QISHLOQQURILISHBANK, UZCARD;HUMO - INFINBANK, UZCARD;HUMO - HAMKORBANK, InFinBank, Hamkorbank, HUMO] officialLanguages: [kaa, uz, ru] +parcelLockerBrand: [LockerPost] diff --git a/app/src/main/assets/country_metadata/UZ.yml b/app/src/main/assets/country_metadata/UZ.yml index dfa59f8741..217cb01a27 100644 --- a/app/src/main/assets/country_metadata/UZ.yml +++ b/app/src/main/assets/country_metadata/UZ.yml @@ -5,5 +5,6 @@ hasDailyAlternateSideParkingSign: true mobileCountryCode: 434 officialLanguages: [uz, ru] orchardProduces: [grape, apple, tomato, apricot, peach, plum, cherry, pear, walnut, persimmon, chilli_pepper, sweet_pepper, almond, hazelnut, pistachio, strawberry] +parcelLockerBrand: [LockerPost] popularReligions: [muslim] postboxesHaveCollectionTimes: true diff --git a/app/src/main/assets/country_metadata/ZA.yml b/app/src/main/assets/country_metadata/ZA.yml index 18e0d48a73..9387a9cf78 100644 --- a/app/src/main/assets/country_metadata/ZA.yml +++ b/app/src/main/assets/country_metadata/ZA.yml @@ -13,5 +13,6 @@ noStoppingLineStyle: red noStoppingSignStyle: sadc officialLanguages: [en, zu, xh, af, st, tn, nso, ts] orchardProduces: [grape, orange, lemon, lime, apple, avocado, grapefruit, pear, pineapple, peach, chilli_pepper, sweet_pepper, tomato, plum, banana, guava, mango, mangosteen, apricot] +parcelLockerBrand: [pudo] popularSports: [tennis, soccer, bowls, basketball, golf, cricket, netball, field_hockey, rugby] postboxesHaveCollectionTimes: true diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.kt b/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.kt index f30b509ce6..00674dff07 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.kt @@ -68,6 +68,7 @@ data class IncompleteCountryInfo( val noStoppingSignStyle: String? = null, val officialLanguages: List? = null, val orchardProduces: List? = null, + val parcelLockerBrand: List? = null, val pictogramCycleLaneStyle: String? = null, val popularReligions: List? = null, val popularSports: List? = null, @@ -177,6 +178,8 @@ data class CountryInfo(private val infos: List) { get() = infos.firstNotNullOfOrNull { it.noStoppingLineStyle } val orchardProduces: List get() = infos.firstNotNullOfOrNull { it.orchardProduces } ?: emptyList() + val parcelLockerBrand: List? + get() = infos.firstNotNullOfOrNull { it.parcelLockerBrand } val popularSports: List get() = infos.firstNotNullOfOrNull { it.popularSports } ?: emptyList() val slowZoneLabelPosition: String? diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/QuestsModule.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/QuestsModule.kt index 7e31e5f8b0..94b8a96a77 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/QuestsModule.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/QuestsModule.kt @@ -112,6 +112,7 @@ import de.westnordost.streetcomplete.quests.oneway_suspects.data.WayTrafficFlowD import de.westnordost.streetcomplete.quests.opening_hours.AddOpeningHours import de.westnordost.streetcomplete.quests.opening_hours_signed.CheckOpeningHoursSigned import de.westnordost.streetcomplete.quests.orchard_produce.AddOrchardProduce +import de.westnordost.streetcomplete.quests.parcel_locker_brand.AddParcelLockerBrand import de.westnordost.streetcomplete.quests.parcel_locker_mail_in.AddParcelLockerMailIn import de.westnordost.streetcomplete.quests.parcel_locker_pickup.AddParcelLockerPickup import de.westnordost.streetcomplete.quests.parking_access.AddBikeParkingAccess @@ -387,6 +388,7 @@ fun questTypeRegistry( 73 to AddBikeRentalCapacity(), // less ambiguous than bike parking 74 to AddBikeParkingCapacity(), // used by cycle map layer on osm.org, OsmAnd + 167 to AddParcelLockerBrand(), 168 to AddParcelLockerPickup(), 169 to AddParcelLockerMailIn(), diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/parcel_locker_brand/AddParcelLockerBrand.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/parcel_locker_brand/AddParcelLockerBrand.kt new file mode 100644 index 0000000000..260f6c4bd6 --- /dev/null +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/parcel_locker_brand/AddParcelLockerBrand.kt @@ -0,0 +1,31 @@ +package de.westnordost.streetcomplete.quests.parcel_locker_brand + +import de.westnordost.streetcomplete.R +import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry +import de.westnordost.streetcomplete.data.osm.mapdata.Element +import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry +import de.westnordost.streetcomplete.data.osm.mapdata.filter +import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType +import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.POSTMAN +import de.westnordost.streetcomplete.osm.Tags + +class AddParcelLockerBrand : OsmFilterQuestType() { + + override val elementFilter = "nodes with amenity = parcel_locker and !brand and !name and !operator" + override val changesetComment = "Specify parcel locker brand" + override val wikiLink = "Tag:amenity=parcel_locker" + override val icon = R.drawable.ic_quest_parcel_locker_brand + override val isDeleteElementEnabled = true + override val achievements = listOf(POSTMAN) + + override fun getTitle(tags: Map) = R.string.quest_parcel_locker_brand + + override fun getHighlightedElements(element: Element, getMapData: () -> MapDataWithGeometry) = + getMapData().filter("nodes with amenity = parcel_locker") + + override fun createForm() = AddParcelLockerBrandForm() + + override fun applyAnswerTo(answer: String, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) { + tags["brand"] = answer + } +} diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/parcel_locker_brand/AddParcelLockerBrandForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/parcel_locker_brand/AddParcelLockerBrandForm.kt new file mode 100644 index 0000000000..b7fc3460f0 --- /dev/null +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/parcel_locker_brand/AddParcelLockerBrandForm.kt @@ -0,0 +1,12 @@ +package de.westnordost.streetcomplete.quests.parcel_locker_brand + +import de.westnordost.streetcomplete.quests.ANameWithSuggestionsForm + +class AddParcelLockerBrandForm : ANameWithSuggestionsForm() { + + override val suggestions: List? get() = countryInfo.parcelLockerBrand + + override fun onClickOk() { + applyAnswer(name!!) + } +} diff --git a/app/src/main/res/drawable/ic_quest_parcel_locker_brand.xml b/app/src/main/res/drawable/ic_quest_parcel_locker_brand.xml new file mode 100644 index 0000000000..f8d73ebd9f --- /dev/null +++ b/app/src/main/res/drawable/ic_quest_parcel_locker_brand.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a8377138fb..9de7f091bb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1273,6 +1273,7 @@ If there are no signs along the whole street which apply for the highlighted sec Brazil nuts Tung nuts + "What’s the brand of this parcel locker?" Can you pick up parcels here? Can you drop off parcels here? diff --git a/build.gradle.kts b/build.gradle.kts index c52447d0d9..d5fda83b3d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -43,6 +43,15 @@ tasks.register("updateAtmOperators") { minPercent = 0.1 } +tasks.register("updateParcelLockerBrand") { + group = "streetcomplete" + targetFile = "$projectDir/res/country_metadata/parcelLockerBrand.yml" + osmTag = "brand" + sparqlQueryPart = "osmkey:amenity 'parcel_locker';" + minCount = 2 + minPercent = 0.1 +} + tasks.register("updateClothesContainerOperators") { group = "streetcomplete" targetFile = "$projectDir/res/country_metadata/clothesContainerOperators.yml" @@ -107,6 +116,7 @@ tasks.register("updateStreetCompleteData") { "updateChargingStationOperators", "updateClothesContainerOperators", "updateAtmOperators", + "updateParcelLockerBrand", "generateQuestList", "app:updatePresets", "app:updateNsiPresets", diff --git a/res/country_metadata/parcelLockerBrand.yml b/res/country_metadata/parcelLockerBrand.yml new file mode 100644 index 0000000000..47f9dab0ea --- /dev/null +++ b/res/country_metadata/parcelLockerBrand.yml @@ -0,0 +1,474 @@ +# Do not edit manually, if anything is wrong here it almost certainly should be fixed in OSM map data. +# Data generated by counting number of OSM elements in the respective countries. + +AM: + - Գլոբինգ # 4 + - Onex # 2 + - OmniCDEK # 2 +AT: + - Amazon Hub # 69 + - Myflexbox # 63 + - Post Abholstation # 41 + - Amazon Locker # 13 + - MYFLEXBOX # 12 + - DHL Packstation # 4 + - Amazon # 3 + - Tamburi # 2 + - GLS # 2 + - Amazon Hub Locker # 2 + - A1 # 2 +AU-ACT: + - Australia Post # 5 +AU-NSW: + - Australia Post # 21 +AU-QLD: + - Australia Post # 27 + - Amazon Hub # 4 +AU-SA: + - Australia Post # 3 +AU-TAS: + - Australia Post # 5 + - Amazon Hub # 2 +AU-VIC: + - Australia Post # 49 + - Amazon Hub # 6 +AU-WA: + - Australia Post # 5 +AX: + - Åland Post # 4 +BE-VLG: + - bpost # 8 + - bpost Pakjesautomaat # 5 +BE-WAL: + - bpost # 5 + - Mondial Relay # 5 + - Bpost # 2 +BG: + - BoxNow # 32 + - easybox # 30 + - Еконт # 25 + - Speedy # 15 + - Box Now # 5 +BY: + - Белпошта # 13 +CA-AB: + - Canada Post # 4 +CA-BC: + - Amazon Locker # 11 + - Amazon Hub # 11 +CA-ON: + - Amazon Hub # 10 + - Locker InPost # 5 +CH: + - My Post 24 # 56 + - PickMup # 2 + - MyPost24 # 2 + - DHL Packstation # 2 +CN-BJ: + - 丰巢 # 19 +CN-GD: + - 丰巢 # 17 +CN-JS: + - 丰巢 # 3 +CN-SH: + - 丰巢 # 6 +CZ: + - Packeta # 4291 + - AlzaBox # 1171 + - Penguin Box # 57 + - PPL # 57 + - GLS # 22 + - DPD # 8 + - WE|DO # 6 + - PPL Box # 6 +DE: + - DHL Packstation # 7288 + - Amazon Hub # 446 + - Amazon Locker # 424 + - Packstation # 73 + - Amazon Hub Locker # 65 + - DHL # 40 + - Myflexbox # 21 + - DHL Paketbox # 21 + - Amazon # 15 + - DHL Poststation # 11 +DK: + - Pakkeboksen # 40 + - Nærboks # 3 + - Instabox # 3 + - instabox # 2 +EE: + - Omniva # 59 + - DPD # 13 + - DPD Pickup Station # 7 + - Smartpost Itella # 6 + - DHL # 5 + - UPS # 3 + - Venipak # 2 + - DPD Pickup # 2 +ES-AN: + - Amazon Locker # 17 + - Amazon Hub Locker # 10 + - Amazon Hub # 9 + - CityPaq # 2 +ES-CL: + - Amazon Hub # 6 + - Amazon Locker # 3 +ES-CT: + - Amazon Locker # 9 + - Amazon Hub # 9 + - CityPaq # 6 +ES-GA: + - Amazon Hub Locker # 3 + - Amazon Hub # 3 + - Amazon Locker # 2 +ES-MC: + - Amazon Hub # 4 +ES-MD: + - Amazon Locker # 10 + - Amazon Hub # 7 + - Amazon Hub Locker # 4 + - CityPaq # 2 + - Amazon # 2 +ES-NC: + - Amazon Locker # 3 +ES-PV: + - Amazon Hub # 6 + - CityPaq # 4 + - Amazon Locker # 4 +ES-VC: + - Amazon Locker # 8 + - Amazon Hub # 7 + - CityPaq # 4 +FI: + - Smartpost # 26 + - Posti # 21 + - Postin automaatti # 15 + - Budbee Box # 7 + - Pakettipiste # 5 + - Smartmile # 2 + - PostNord # 2 + - Budbee # 2 +FR: + - Amazon Hub # 402 + - Mondial Relay # 291 + - Amazon Locker # 212 + - Pickup Station # 126 + - Amazon # 18 + - Amazon Hub Locker # 12 + - Pickup # 8 + - La Poste # 6 + - Decathlon # 6 + - InPost # 4 + - Vinted # 3 + - Parcel Pending # 3 + - Locker 24/7 # 3 + - Casino # 3 + - Mondial relay # 2 + - Leroy Merlin # 2 + - GLS;Relais colis;UPS # 2 + - Box Colis Mobile # 2 + - Amazon locker # 2 +GB-ENG: + - InPost # 433 + - Amazon Hub # 351 + - Amazon Locker # 205 + - Amazon Hub Locker # 88 + - Locker InPost # 73 + - Amazon # 14 + - Evri # 11 + - Yeep # 7 + - DPD # 4 + - Inpost UK Ltd # 3 + - ebay # 2 + - Growing Communities # 2 + - ASDA # 2 +GB-SCT: + - Amazon Hub # 31 + - InPost # 28 + - Locker InPost # 7 + - Amazon Locker # 6 + - Amazon Hub Locker # 2 +GB-WLS: + - Amazon Hub # 9 + - InPost # 6 + - Amazon Locker # 4 +GE: + - Locker.ge # 3 +GR: + - BoxNow # 32 + - Box Now # 12 + - Skroutz Point # 5 + - Skroutz # 2 +HK: + - 順豐速運 SF Express # 2 +HR: + - Paket24 # 41 + - GLS # 26 + - BoxNow # 9 +HU: + - GLS # 1375 + - easybox # 708 + - Foxpost # 667 + - Packeta # 131 + - AlzaBox # 59 + - Magyar Posta Logisztika (MPL) # 56 + - MPL # 51 + - FoxPost # 15 + - DHL # 9 + - Alzabox # 6 +ID-JW: + - PopBox # 3 + - Paxel # 3 +IS: + - Pósturinn # 3 +IT: + - Amazon Hub # 178 + - Amazon Locker # 112 + - InPost # 58 + - Amazon Hub Locker # 41 + - PuntoPoste # 9 + - Locker InPost # 8 + - Amazon # 4 +IT-32: + - Amazon Hub # 5 + - Amazon Locker # 2 +IT-36: + - Amazon Hub # 10 + - Amazon Locker # 6 + - InPost # 2 + - Amazon # 2 +IT-82: + - Amazon Locker # 11 + - Amazon Hub # 11 + - InPost # 10 + - Locker InPost # 3 +JP: + - Amazon Hub ロッカー # 95 + - プドー # 72 + - Amazon Locker # 15 + - PUDOステーション # 13 + - はこぽす # 5 + - PUDO # 4 + - Tajimingo # 3 + - amazon # 2 + - Amazon Hub Locker # 2 +KZ: + - Қазпошта # 2 +LT: + - Omniva # 51 + - LP Express # 20 + - DPD # 20 + - DPD Pickup Station # 10 + - uDrop # 9 + - Venipak # 9 + - OMNIVA # 5 + - Smartpost # 4 + - Lietuvos Paštas # 4 + - Omniva paštomatas # 2 + - LP express paštomatas # 2 + - LP EXPRESS # 2 +LU: + - POST Luxembourg # 43 +LV: + - Omniva # 24 + - Smartpost # 17 + - DPD # 17 + - Latvijas Pasts # 8 + - Itella # 3 + - DPD Pickup Station # 3 + - Venipak # 2 +MX: + - Amazon Hub # 4 +NL: + - PostNL # 20 + - DHL # 19 + - DHL Packstation # 6 + - de Buren # 5 + - Hub # 4 + - Budbee # 3 + - MyPup # 2 + - DHL Parcelstation # 2 +NO: + - Posten # 14 + - PostNord # 4 + - Pakkeboks # 3 +PL: + - Paczkomat InPost # 12328 + - Allegro One Box # 1093 + - Orlen Paczka # 802 + - DPD Pickup Station # 611 + - DHL Pop Box # 184 + - AliExpress # 87 + - DPD # 46 + - Allegro # 35 + - InPost # 31 + - DHL POP BOX # 31 + - DHL # 29 + - Orlen # 20 +PT: + - Locky CTT # 5 + - Locky # 2 +RO: + - easybox # 606 + - FANbox # 78 + - GLS # 22 + - Ship & Go # 11 + - EasyBox # 8 + - DPD Pickup Station # 5 + - Sameday Easybox # 3 + - Cargus # 2 +RS: + - Поштин Пакетомат # 2 +RS-VO: + - Поштин пакетомат # 6 +RU: + - Ozon Box # 91 + - PickPoint # 86 + - Ozon box # 65 + - Почта России # 54 + - 5post # 46 + - ОмниСДЭК # 44 + - Халва # 43 + - Яндекс.Маркет # 35 + - Cainiao # 30 + - СберЛогистика # 20 + - Ozon # 20 + - СДЭК # 12 + - 5Post # 9 + - Qiwi # 6 + - Цайняо # 5 + - Яндекс Маркет # 4 + - Утконос # 4 + - Wildberries # 3 + - fivepost.ru # 2 + - QIWI # 2 + - OZON # 2 + - InPost # 2 + - Aliexpress # 2 + - AliExpress # 2 +RU-AD: + - Почта России # 2 +RU-ME: + - Ozon # 2 +RU-TA: + - Ozon box # 52 + - Почта России # 31 + - Cainiao # 27 + - Яндекс.Маркет # 17 + - Сберлогистика # 13 + - 5post # 13 + - Ozon Box # 10 + - Халва # 9 + - PickPoint # 7 + - ОмниСДЭК # 5 + - Ozon # 2 + - Fivepost # 2 + - AliExpress;Cainiao # 2 +SE: + - Instabox # 52 + - PostNord # 12 + - Budbee # 7 + - Paketbox # 3 + - iBoxen # 2 + - Postnord # 2 + - PostNord Paketbox # 2 +SG: + - Pick # 9 + - POPStation # 5 +SI: + - GLS # 89 + - PS Paketomat # 17 + - DPD # 6 +SK: + - Packeta # 326 + - AlzaBox # 269 + - BalíkoBOX # 74 + - GLS Balíkomat # 36 + - GLS # 33 + - Z-BOX # 14 + - Penguin Box # 3 + - Dr. Max # 2 + - Direct4me # 2 + - Balíkomat # 2 +TW: + - i郵箱 # 2401 +UA: + - Нова Пошта # 316 + - Нова пошта # 22 + - Meest # 17 + - Rozetka # 16 +US-AZ: + - Amazon Hub # 9 + - Amazon Locker # 8 +US-CA: + - Amazon Hub # 39 + - Amazon Locker # 11 + - Amazon Hub Locker # 7 +US-CO: + - Amazon Locker # 5 + - Amazon Hub # 4 +US-DC: + - Amazon Hub # 2 +US-FL: + - Amazon Hub # 7 + - Amazon Hub Locker # 3 + - Amazon Locker # 2 +US-GA: + - Amazon Hub # 18 + - Amazon Locker # 2 +US-IL: + - Amazon Hub # 12 +US-MA: + - Amazon Hub # 5 +US-MD: + - Amazon Hub # 9 + - Amazon Locker # 4 +US-MO: + - Amazon Locker # 4 +US-NC: + - Amazon Locker # 2 +US-NJ: + - Amazon Hub # 5 + - Amazon Hub Locker # 3 +US-NV: + - Amazon Hub # 6 + - Amazon Locker # 2 +US-NY: + - Amazon Hub # 10 + - Amazon Locker # 5 + - Amazon Hub Locker # 5 +US-OH: + - Amazon Hub # 3 + - Amazon Locker # 2 +US-OK: + - Amazon Hub # 2 +US-OR: + - Amazon Hub # 22 + - Amazon Locker # 3 +US-PA: + - Amazon Hub # 24 + - Amazon Locker # 11 + - Amazon Hub Locker # 5 +US-SC: + - Amazon Hub # 2 +US-TN: + - Amazon Locker # 2 +US-TX: + - Amazon Hub Locker # 13 + - Amazon Hub # 7 + - Amazon Locker # 5 +US-VA: + - Amazon Hub # 12 +US-WA: + - Amazon Hub # 32 + - Amazon Locker # 12 + - Amazon # 4 +US-WI: + - Amazon Hub # 3 +UZ: + - LockerPost # 224 +UZ-QR: + - LockerPost # 17 +ZA: + - pudo # 2 diff --git a/res/graphics/authors.txt b/res/graphics/authors.txt index f30b23f19e..c672fb1a19 100644 --- a/res/graphics/authors.txt +++ b/res/graphics/authors.txt @@ -366,6 +366,7 @@ quest/ oneway.svg opening_hours.svg opening_hours_signed.svg + parcel_locker_brand.svg Arthur-GYT, parts from Google Noto Color Emoji: U+1F4E6 parcel_locker_deposit.svg Arthur-GYT, parts from Google Noto Color Emoji: U+1F4E6 parcel_locker_pickup.svg Arthur-GYT, parts from Google Noto Color Emoji: U+1F4E6 parking.svg diff --git a/res/graphics/quest/parcel_locker_brand.svg b/res/graphics/quest/parcel_locker_brand.svg new file mode 100644 index 0000000000..b43f07e472 --- /dev/null +++ b/res/graphics/quest/parcel_locker_brand.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +