Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support addr:place tag in Address field #9603

Merged
merged 13 commits into from May 26, 2023
4 changes: 3 additions & 1 deletion CHANGELOG.md
Expand Up @@ -41,6 +41,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
#### :sparkles: Usability & Accessibility
* Make it easier to search for OSM objects by id ([#9520], thanks [@k-yle])
* Localize numbers in numeric fields ([#8769], thanks [@1ec5])
* The Address field now supports the `addr:place` tag (as an alternative to `addr:street`), this functionality is activated in selected countries ([#9603])
#### :scissors: Operations
#### :camera: Street-Level
#### :white_check_mark: Validation
Expand All @@ -65,7 +66,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
* Render "right-side" arrows for features with lifecycle prefixes ([#9493], thanks [@k-yle])
* Take regional variants of parent presets into account when resolving preset fields ([#9524])
* Render "right-side" arrows for `man_made=quay` features
* Add support icons also in `multiCombo` and `semiCombo` fields ([#9433])
* Support icons also in `multiCombo` and `semiCombo` fields ([#9433])
#### :hammer: Development
* Upgrade dependencies: `fortawesome` to v6.4, `which-polygon` to v2.2.1, `glob` to v9.2, `temaki` to v5.4, `marked` to v4.3, `core-js-bundle` to v3.30, `osm-auth` to v2.1
* Bundle `package-lock.json` file in repository for faster `clean-install` builds
Expand All @@ -82,6 +83,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
[#9501]: https://github.com/openstreetmap/iD/pull/9501
[#9520]: https://github.com/openstreetmap/iD/pull/9520
[#9524]: https://github.com/openstreetmap/iD/issues/9524
[#9603]: https://github.com/openstreetmap/iD/pull/9603
[#9630]: https://github.com/openstreetmap/iD/pull/9630
[#9637]: https://github.com/openstreetmap/iD/pull/9637
[#9638]: https://github.com/openstreetmap/iD/pull/9638
Expand Down
13 changes: 13 additions & 0 deletions css/80_app.css
Expand Up @@ -2128,6 +2128,19 @@ input.date-selector {
.ideditor[dir='rtl'] .addr-row:last-of-type input:last-of-type {
border-radius: 0 0 0 4px;
}
.combobox-address-street-place .combobox-option.address-street,
.combobox-address-street-place .combobox-option.address-place {
padding-right: 20px;
}
.combobox-address-street-place .combobox-option.address-street::after,
.combobox-address-street-place .combobox-option.address-place::after {
position: absolute;
right: 2px;
opacity: 0.4;
}
.combobox-address-street-place .combobox-option.address-place::after {
content: url(data:image/svg+xml;charset=utf-8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMCIgeT0iMCIgd2lkdGg9IjIwIiBoZWlnaHQ9IjIwIiB2aWV3Qm94PSIwIDAgMjAgMjAiPg0KICAgIDxwYXRoIGQ9Ik0xMCwzIEM2LjY4NiwzIDQsNS42MTIgNCw4LjgzMyBDNCwxMi4wNTUgMTAsMTcgMTAsMTcgQzEwLDE3IDE2LDEyLjA1NSAxNiw4LjgzMyBDMTYsNS42MTIgMTMuMzE0LDMgMTAsMyB6IE0xMC4xODcsNi41IEMxMS41MTMsNi41IDEyLjU4Nyw3LjU0NSAxMi41ODcsOC44MzMgQzEyLjU4NywxMC4xMjIgMTEuNTEzLDExLjE2NyAxMC4xODcsMTEuMTY3IEM4Ljg2MiwxMS4xNjcgNy43ODcsMTAuMTIyIDcuNzg3LDguODMzIEM3Ljc4Nyw3LjU0NSA4Ljg2Miw2LjUgMTAuMTg3LDYuNSB6IiBmaWxsPSJjdXJyZW50Q29sb3IiLz4NCjwvc3ZnPg==);
}


/* Field - Wikipedia
Expand Down
59 changes: 48 additions & 11 deletions data/address_formats.json
@@ -1,7 +1,7 @@
[
{
"format": [
["housenumber", "street"],
["housenumber", "street+place"],
["city", "postcode"]
]
},
Expand All @@ -16,47 +16,70 @@
"countryCodes": ["gb"],
"format": [
["housename"],
["housenumber", "street"],
["housenumber", "street+place"],
["city", "postcode"]
]
},
{
"countryCodes": ["ie"],
"format": [
["housename"],
["housenumber", "street"],
["housenumber", "street+place"],
["city"],
["postcode"]
]
},
{
"countryCodes": ["at", "bg", "ch", "de", "si", "pl"],
"countryCodes": ["at", "bg", "ch", "de", "si", "pl", "lt"],
"format": [
["street", "housenumber"],
["street+place", "housenumber"],
["postcode", "city"]
]
},
{
"countryCodes": [
"ad", "ba", "be", "cz", "dk", "es", "fi", "gr", "hr", "is",
"it", "li", "nl", "no", "pt", "se", "sk", "sm", "va"
"ad", "ba", "be", "dk", "es", "gr", "hr",
"it", "pt", "se", "sm", "va"
],
"format": [
["street+place", "housenumber", "unit"],
["postcode", "city"]
]
},
{
"countryCodes": [
"fi", "is", "li", "nl", "no"
],
"format": [
["street", "housenumber", "unit"],
["postcode", "city"]
]
},
{
"countryCodes": ["fr", "lu", "mo"],
"countryCodes": ["fr", "lu"],
"format": [
["housenumber", "street+place"],
["postcode", "city"]
]
},
{
"countryCodes": ["mo"],
"format": [
["housenumber", "street"],
["postcode", "city"]
]
},
{
"countryCodes": ["lv"],
"format": [
["street", "housenumber"],
["city", "postcode"]
]
},
{
"countryCodes": ["br"],
"format": [
["street"],
["street+place"],
["housenumber", "suburb"],
["city", "postcode"]
]
Expand Down Expand Up @@ -89,7 +112,7 @@
"countryCodes": ["tw"],
"format": [
["postcode", "city", "district"],
["place", "street"],
["street+place"],
["housenumber", "floor", "unit"]
]
},
Expand Down Expand Up @@ -121,7 +144,7 @@
"countryCodes": ["tr"],
"format": [
["neighbourhood"],
["street", "housenumber"],
["street+place", "housenumber"],
["postcode", "district", "city"]
]
},
Expand Down Expand Up @@ -187,6 +210,20 @@
["district"]
]
},
{
"countryCodes": ["ru"],
"format": [
["housenumber", "street+place"],
["city", "postcode"]
]
},
{
"countryCodes": ["cz", "sk"],
"format": [
["street", "housenumber"],
["postcode", "city"]
]
},
{
"countryCodes": ["ph"],
"format": [
Expand Down
2 changes: 1 addition & 1 deletion modules/services/streetside.js
Expand Up @@ -852,7 +852,7 @@ export default {
bubbleIdQuadKey = '0' + bubbleIdQuadKey;
}
const imgUrlPrefix = streetsideImagesApi + 'hs' + bubbleIdQuadKey;
const imgUrlSuffix = '.jpg?g=13305&n=z';
const imgUrlSuffix = '.jpg?g=13515&n=z';

// Cubemap face code order matters here: front=01, right=02, back=03, left=10, up=11, down=12
const faceKeys = ['01','02','03','10','11','12'];
Expand Down