midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Rework units to allow picking different default units in different locations, fixes #1011

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-08-18 19:17:15 +02:00
parent e981abd2aa
commit 5da76b9418
17 changed files with 149 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

3
assets/layers/elevator/elevator.json
View file

@ -185,6 +185,7 @@
"alternativeDenomination": [
"meter"
],
"useIfNoUnitGiven": true,
"human": {
"en": "meter",
"fr": "mètre",
@ -193,7 +194,7 @@
}
},
{
"default": true,
"useAsDefaultInput": true,
"canonicalDenomination": "cm",
"alternativeDenomination": [
"centimeter",

8
assets/layers/entrance/entrance.json
View file

@ -467,10 +467,12 @@
"units": [
{
"appliesToKey": [
"kerb:height"
"kerb:height",
"width"
],
"applicableUnits": [
{
{
"useIfNoUnitGiven": true,
"canonicalDenomination": "m",
"alternativeDenomination": [
"meter"
@ -483,7 +485,7 @@
}
},
{
"default": true,
"useAsDefaultInput": true,
"canonicalDenomination": "cm",
"alternativeDenomination": [
"centimeter",

1
assets/layers/hydrant/hydrant.json
View file

@ -456,7 +456,6 @@
{
"applicableUnits": [
{
"default": true,
"canonicalDenomination": "",
"alternativeDenomination": [
"mm",

3
assets/layers/kerbs/kerbs.json
View file

@ -339,8 +339,7 @@
"nl": "centimeter",
"de": "Zentimeter",
"fr": "centimètre"
},
"default": true
}
},
{
"canonicalDenomination": "m",

2
assets/layers/maxspeed/maxspeed.json
View file

@ -154,7 +154,6 @@
"kmh",
"kph"
],
"default": true,
"human": {
"en": "kilometers/hour",
"ca": "quilòmetres/hora",
@ -172,6 +171,7 @@
},
{
"canonicalDenomination": "mph",
"useIfNoUnitGiven": ["gb","us"],
"alternativeDenomination": [
"m/u",
"mh",

9
assets/layers/walls_and_buildings/walls_and_buildings.json
View file

@ -63,6 +63,7 @@
],
"applicableUnits": [
{
"useIfNoUnitGiven": true,
"canonicalDenomination": "m",
"alternativeDenomination": [
"meter"
@ -74,16 +75,16 @@
}
},
{
"default": true,
"useAsDefaultInput": true,
"canonicalDenomination": "cm",
"alternativeDenomination": [
"centimeter",
"cms"
],
"human": {
"en": "centimeter",
"fr": "centimètre",
"de": "Zentimeter"
"en": " centimeter",
"fr": " centimètre",
"de": " Zentimeter"
}
}
]

3
assets/themes/climbing/climbing.json
View file

@ -132,8 +132,7 @@
"ca": " metre",
"nb_NO": " meter",
"es": " metro"
},
"default": true
}
},
{
"canonicalDenomination": "ft",

4
assets/themes/mapcomplete-changes/mapcomplete-changes.json
View file

@ -215,10 +215,6 @@
"if": "theme=indoors",
"then": "./assets/layers/entrance/entrance.svg"
},
{
"if": "theme=kakampink",
"then": "bug"
},
{
"if": "theme=kerbs_and_crossings",
"then": "./assets/layers/kerbs/KerbIcon.svg"