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.

Sign up for GitHub

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
Merged

Support addr:place tag in Address field #9603

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5cd5c10
consolidate similar methods
tyrasd Apr 14, 2023
a0b5cf5
filter address combo field while typing
tyrasd Apr 17, 2023
0267379
implement special address field for addr:street/addr:place
tyrasd Apr 24, 2023
2808edb
tweak address formats: make street+place default
tyrasd Apr 28, 2023
caac22f
show addr:street when both it and addr:place is present
tyrasd Apr 28, 2023
316b819
addresses in Czech Republic and Slovakia are more complicated
tyrasd Apr 28, 2023
aca88bf
fix bug in getting nearby postcodes
tyrasd Apr 28, 2023
2ed1f08
use addr+place subfield for Taiwan
tyrasd Apr 28, 2023
6f9bb11
fix logic bug, make condition more readable
tyrasd Apr 30, 2023
9aa28fa
only offer admin_level>8 for addr:place
tyrasd Apr 30, 2023
9595e99
Merge branch 'develop' into addr_place
tyrasd May 26, 2023
dbc857b
update changelog
tyrasd May 26, 2023
eb30c2e
drop icon from "regular" addr:street suggestions in dropdown
tyrasd May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions css/80_app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2100,6 +2100,22 @@ 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-street::after {
content: url(data:image/svg+xml;charset=utf-8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMCIgeT0iMCIgd2lkdGg9IjIwIiBoZWlnaHQ9IjIwIiB2aWV3Qm94PSIwIDAgMjAgMjAiPg0KICAgIDxwYXRoIGQ9Ik0xNC41NTgsMyBDMTMuMjEsMyAxMi4xMTYsNC4wOTMgMTIuMTE2LDUuNDQyIEMxMi4xMTYsNS42ODggMTIuMTYxLDUuOTIgMTIuMjI4LDYuMTQ0IEw2LjE0NCwxMi4yMjggQzUuOTIsMTIuMTYxIDUuNjg4LDEyLjExNiA1LjQ0MiwxMi4xMTYgQzQuMDkzLDEyLjExNiAzLDEzLjIxIDMsMTQuNTU4IEMzLDE1LjkwNyA0LjA5MywxNyA1LjQ0MiwxNyBDNi43OSwxNyA3Ljg4NCwxNS45MDcgNy44ODQsMTQuNTU4IEM3Ljg4NCwxNC4zMTIgNy44MzksMTQuMDggNy43NzIsMTMuODU2IEwxMy44NTYsNy43NzIgQzE0LjA4LDcuODM5IDE0LjMxMiw3Ljg4NCAxNC41NTgsNy44ODQgQzE1LjkwNyw3Ljg4NCAxNyw2Ljc5IDE3LDUuNDQyIEMxNyw0LjA5MyAxNS45MDcsMyAxNC41NTgsMyB6IE0xNC41NTgsNC40NjUgQzE1LjA5OCw0LjQ2NSAxNS41MzUsNC45MDIgMTUuNTM1LDUuNDQyIEMxNS41MzUsNS45ODEgMTUuMDk4LDYuNDE5IDE0LjU1OCw2LjQxOSBDMTQuMDE5LDYuNDE5IDEzLjU4MSw1Ljk4MSAxMy41ODEsNS40NDIgQzEzLjU4MSw0LjkwMiAxNC4wMTksNC40NjUgMTQuNTU4LDQuNDY1IHogTTUuNDQyLDEzLjU4MSBDNS45ODEsMTMuNTgxIDYuNDE5LDE0LjAxOSA2LjQxOSwxNC41NTggQzYuNDE5LDE1LjA5OCA1Ljk4MSwxNS41MzUgNS40NDIsMTUuNTM1IEM0LjkwMiwxNS41MzUgNC40NjUsMTUuMDk4IDQuNDY1LDE0LjU1OCBDNC40NjUsMTQuMDE5IDQuOTAyLDEzLjU4MSA1LjQ0MiwxMy41ODEgeiIgZmlsbD0iY3VycmVudENvbG9yIi8+DQo8L3N2Zz4=);
}
.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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 @@ -186,5 +209,19 @@
["city", "postcode"],
["district"]
]
},
{
"countryCodes": ["ru"],
"format": [
["housenumber", "street+place"],
["city", "postcode"]
]
},
{
"countryCodes": ["cz", "sk"],
"format": [
["street", "housenumber"],
["postcode", "city"]
]
}
]
2 changes: 1 addition & 1 deletion modules/services/streetside.js
View file
Open in desktop
Original file line number Diff line number Diff line change
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
Loading