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

Add missing translations, improvements to charging stations theme

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-26 01:14:22 +02:00
parent 0252fd43ab
commit e8b0c3f4c8
7 changed files with 1207 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Logic/FeatureSource/FeaturePipeline.ts
View file

@ -100,7 +100,7 @@ export default class FeaturePipeline {
this.relationTracker = new RelationsTracker()
state.changes.allChanges.addCallbackAndRun(allChanges => {
allChanges.filter(ch => ch.id < 0)
allChanges.filter(ch => ch.id < 0 && ch.changes !== undefined)
.map(ch => ch.changes)
.filter(coor => coor["lat"] !== undefined && coor["lon"] !== undefined)
.forEach(coor => {

2
UI/Popup/MoveWizard.ts
View file

@ -198,7 +198,7 @@ export default class MoveWizard extends Toggle {
moveDisallowedReason.setData(t.isWay)
} else if (id.startsWith("relation")) {
moveDisallowedReason.setData(t.isRelation)
} else {
} else if(id.indexOf("-") < 0) {
OsmObject.DownloadReferencingWays(id).then(referencing => {
if (referencing.length > 0) {

11
assets/layers/bike_repair_station/bike_repair_station.json
View file

@ -615,16 +615,7 @@
"level"
],
"icon": {
"render": {
"en": "./assets/layers/bike_repair_station/repair_station.svg",
"ru": "./assets/layers/bike_repair_station/repair_station.svg",
"it": "./assets/layers/bike_repair_station/repair_station.svg",
"fi": "./assets/layers/bike_repair_station/repair_station.svg",
"fr": "./assets/layers/bike_repair_station/repair_station.svg",
"pt_BR": "./assets/layers/bike_repair_station/repair_station.svg",
"de": "./assets/layers/bike_repair_station/repair_station.svg",
"pt": "./assets/layers/bike_repair_station/repair_station.svg"
},
"render": "./assets/layers/bike_repair_station/repair_station.svg",
"mappings": [
{
"if": {

1137
assets/layers/charging_station/charging_station.json
View file

File diff suppressed because it is too large Load diff

103
assets/layers/charging_station/charging_station.protojson
View file

@ -119,14 +119,14 @@
"if": "access=customers",
"then": {
"en": "Only customers of the place this station belongs to can use this charging station<br/><span class='subtle'>E.g. a charging station operated by hotel which is only usable by their guests</span>",
"nl": "Enkel <b>klanten van de bijhorende plaats</b> mogen dit oplaadpunt gebruiken<br/><span class='subtle'>Bijvoorbeeld een oplaadpunt op de parking van een restaurant dat enkel door klanten van het restaurant gebruikt mag worden</span>"
"nl": "Enkel <b>klanten van de bijhorende plaats</b> mogen dit oplaadpunt gebruiken<br/><span class='subtle'>Bv. op de parking van een hotel en enkel toegankelijk voor klanten van dit hotel</span>"
}
},
{
"if": "access=private",
"then": {
"en": "Not accessible to the general public (e.g. only accessible to the owners, employees, ...)",
"nl": "Niet toegankelijk voor het publiek <span class='subtle'>Enkel toegankelijk voor de eigenaar, medewerkers ,...</span> "
"nl": "Niet toegankelijk voor het publiek <br/><span class='subtle'>Bv. enkel toegankelijk voor de eigenaar, medewerkers ,...</span> "
}
}
]
@ -419,10 +419,12 @@
{
"id": "Network",
"render": {
"en": "Part of the network <b>{network}</b>"
"en": "Part of the network <b>{network}</b>",
"nl": "Maakt deel uit van het <b>{network}</b>-netwerk"
},
"question": {
"en": "Is this charging station part of a network?"
"en": "Is this charging station part of a network?",
"nl": "Is dit oplaadpunt deel van een groter netwerk?"
},
"freeform": {
"key": "network"
@ -431,13 +433,15 @@
{
"if": "no:network=yes",
"then": {
"en": "Not part of a bigger network"
"en": "Not part of a bigger network",
"nl": "Maakt geen deel uit van een groter netwerk"
}
},
{
"if": "network=none",
"then": {
"en": "Not part of a bigger network"
"en": "Not part of a bigger network",
"nl": "Maakt geen deel uit van een groter netwerk"
},
"hideInAnswer": true
},
@ -458,10 +462,12 @@
{
"id": "Operator",
"question": {
"en": "Who is the operator of this charging station?"
"en": "Who is the operator of this charging station?",
"nl": "Wie beheert dit oplaadpunt?"
},
"render": {
"en": "This charging station is operated by {operator}"
"en": "This charging station is operated by {operator}",
"nl": "Wordt beheerd door {operator}"
},
"freeform": {
"key": "operator"
@ -474,7 +480,8 @@
]
},
"then": {
"en": "Actually, {operator} is the network"
"en": "Actually, {operator} is the network",
"nl": "Eigenlijk is {operator} het netwerk waarvan het deel uitmaakt"
},
"addExtraTags": [
"operator="
@ -486,10 +493,11 @@
{
"id": "phone",
"question": {
"en": "What number can one call if there is a problem with this charging station?"
"en": "What number can one call if there is a problem with this charging station?",
"nl": "Wat is het telefoonnummer van de beheerder van dit oplaadpunt?"
},
"render": {
"en": "In case of problems, call <a href='tel:{phone}'>{phone}</a>"
"en": "In case of problems, call <a href='tel:{phone}'>{phone}</a>", "nl": "Bij problemen, bel naar <a href='tel:{phone}'>{phone}</a>"
},
"freeform": {
"key": "phone",
@ -499,10 +507,12 @@
{
"id": "email",
"question": {
"en": "What is the email address of the operator?"
"en": "What is the email address of the operator?",
"nl": "Wat is het email-adres van de operator?"
},
"render": {
"en": "In case of problems, send an email to <a href='mailto:{email}'>{email}</a>"
"en": "In case of problems, send an email to <a href='mailto:{email}'>{email}</a>",
"nl": "Bij problemen, email naar <a href='mailto:{email}'>{email}</a>"
},
"freeform": {
"key": "email",
@ -512,10 +522,12 @@
{
"id": "website",
"question": {
"en": "What is the website of the operator?"
"en": "What is the website where one can find more information about this charging station?",
"nl": "Wat is de website waar men meer info kan vinden over dit oplaadpunt?"
},
"render": {
"en": "More info on <a href='{website}'>{website}</a>"
"en": "More info on <a href='{website}'>{website}</a>",
"nl": "Meer informatie op <a href='{website}'>{website}</a>"
},
"freeform": {
"key": "website",
@ -526,7 +538,8 @@
{
"id": "ref",
"question": {
"en": "What is the reference number of this charging station?"
"en": "What is the reference number of this charging station?",
"nl": "Wat is het referentienummer van dit oplaadstation?"
},
"render": {
"en": "Reference number is <b>{ref}</b>",
@ -625,19 +638,22 @@
{
"id": "Parking:fee",
"question": {
"en": "Does one have to pay a parking fee while charging?"
"en": "Does one have to pay a parking fee while charging?",
"nl": "Moet men parkeergeld betalen tijdens het opladen?"
},
"mappings": [
{
"if": "parking:fee=no",
"then": {
"en": "No additional parking cost while charging"
"en": "No additional parking cost while charging",
"nl": "Geen extra parkeerkost tijdens het opladen"
}
},
{
"if": "parking:fee=yes",
"then": {
"en": "An additional parking fee should be paid while charging"
"en": "An additional parking fee should be paid while charging",
"nl": "Tijdens het opladen moet er parkeergeld betaald worden"
}
}
],
@ -716,12 +732,56 @@
"render": "#00f"
},
"presets": [
{
"tags": [
"amenity=charging_station",
"motorcar=no",
"bicycle=yes",
"socket:typee=1"
],
"title": {
"en": "electrical outlet to charge e-bikes",
"nl": "laadpunt met gewone stekker(s) <img src='./assets/layers/charging_station/TypeE.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (bedoeld om electrische fietsen op te laden)"
},
"preciseInput": {
"preferredBackground": "map"
}
},
{
"tags": [
"amenity=charging_station",
"motorcar=no",
"bicycle=yes"
],
"title": {
"en": "charging station for e-bikes",
"nl": "oplaadpunt voor elektrische fietsen"
},
"preciseInput": {
"preferredBackground": "map"
}
},
{
"tags": [
"amenity=charging_station",
"motorcar=yes",
"bicycle=no"
],
"title": {
"en": "charging station for cars",
"nl": "oplaadstation voor elektrische auto's"
},
"preciseInput": {
"preferredBackground": "map"
}
},
{
"tags": [
"amenity=charging_station"
],
"title": {
"en": "Charging station"
"en": "charging station",
"nl": "oplaadstation"
},
"preciseInput": {
"preferredBackground": "map"
@ -765,7 +825,8 @@
"options": [
{
"question": {
"en": "Only working charging stations"
"en": "Only working charging stations",
"nl": "Enkel werkende oplaadpunten"
},
"osmTags": {
"and": [

2
assets/layers/charging_station/csvToJson.ts
View file

@ -259,7 +259,7 @@ function run(file, protojson) {
const stringified = questions.map(q => JSON.stringify(q, null, " "))
let protoString = readFileSync(protojson, "utf8")
protoString = protoString.replace("{\"id\": \"$$$\"}", stringified.join(",\n"))
protoString = protoString.replace(/{[ \t\n]*"id"[ \t\n]*:[ \t\n]*"\$\$\$"[ \t\n]*}/, stringified.join(",\n"))
const proto = <LayerConfigJson>JSON.parse(protoString)
proto.tagRenderings.forEach(tr => {
if (typeof tr === "string") {

4
assets/layers/waste_basket/waste_basket.json
View file

@ -91,6 +91,7 @@
"id": "dispensing_dog_bags",
"question": {
"en": "Does this waste basket have a dispenser for dog excrement bags?",
"nl": "Heeft deze vuilnisbak een verdeler voor hondenpoepzakjes?",
"de": "Verfügt dieser Abfalleimer über einen Spender für (Hunde-)Kotbeutel?"
},
"condition": {
@ -110,6 +111,7 @@
},
"then": {
"en": "This waste basket has a dispenser for (dog) excrement bags",
"nl": "Deze vuilnisbak heeft een verdeler voor hondenpoepzakjes",
"de": "Dieser Abfalleimer verfügt über einen Spender für (Hunde-)Kotbeutel"
}
},
@ -122,6 +124,7 @@
},
"then": {
"en": "This waste basket <b>does not</b> have a dispenser for (dog) excrement bags",
"nl": "Deze vuilbak heeft <b>geen</b> verdeler voor hondenpoepzakjes",
"de": "Dieser Abfalleimer <b>hat keinen</b> Spender für (Hunde-)Kotbeutel"
}
},
@ -129,6 +132,7 @@
"if": "vending=",
"then": {
"en": "This waste basket <b>does not</b> have a dispenser for (dog) excrement bags",
"nl": "Deze vuilnisbak heeft <b>geen</b> verdeler voor hondenpoepzakjes",
"de": "Dieser Abfalleimer <b>hat keinen</b> Spender für (Hunde-)Kotbeutel"
},
"hideInAnwer": true