midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #651 from pietervdvn/develop

Browse source 
Merge develop
This commit is contained in:
Pieter Vander Vennet 2022-02-09 17:41:54 +01:00 committed by GitHub
commit 2b1e83bf32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Docs/TagInfo/mapcomplete_climbing.json
View file

@ -76,7 +76,7 @@
}, },
{ {
"key": "access", "key": "access",
"description": "Layer 'Climbing club' shows access=customers with a fixed text, namely 'Only custumers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')", "description": "Layer 'Climbing club' shows access=customers with a fixed text, namely 'Only customers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
"value": "customers" "value": "customers"
}, },
{ {
@ -254,7 +254,7 @@
}, },
{ {
"key": "access", "key": "access",
"description": "Layer 'Climbing gyms' shows access=customers with a fixed text, namely 'Only custumers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')", "description": "Layer 'Climbing gyms' shows access=customers with a fixed text, namely 'Only customers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
"value": "customers" "value": "customers"
}, },
{ {
@ -435,7 +435,7 @@
}, },
{ {
"key": "access", "key": "access",
"description": "Layer 'Climbing routes' shows access=customers with a fixed text, namely 'Only custumers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')", "description": "Layer 'Climbing routes' shows access=customers with a fixed text, namely 'Only customers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
"value": "customers" "value": "customers"
}, },
{ {
@ -614,7 +614,7 @@
}, },
{ {
"key": "access", "key": "access",
"description": "Layer 'Climbing opportunities' shows access=customers with a fixed text, namely 'Only custumers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')", "description": "Layer 'Climbing opportunities' shows access=customers with a fixed text, namely 'Only customers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
"value": "customers" "value": "customers"
}, },
{ {
@ -779,7 +779,7 @@
}, },
{ {
"key": "access", "key": "access",
"description": "Layer 'Climbing opportunities?' shows access=customers with a fixed text, namely 'Only custumers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')", "description": "Layer 'Climbing opportunities?' shows access=customers with a fixed text, namely 'Only customers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
"value": "customers" "value": "customers"
}, },
{ {

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

@ -1209,7 +1209,7 @@
{ {
"if": "access=customers", "if": "access=customers",
"then": { "then": {
"en": "Only custumers", "en": "Only customers",
"fr": "Réservé aux clients", "fr": "Réservé aux clients",
"de": "Nur für Kunden", "de": "Nur für Kunden",
"it": "Riservato ai clienti" "it": "Riservato ai clienti"

2
langs/themes/en.json
View file

@ -488,7 +488,7 @@
"then": "You need a permit to access here" "then": "You need a permit to access here"
}, },
"2": { "2": {
"then": "Only custumers" "then": "Only customers"
}, },
"3": { "3": {
"then": "Only club members" "then": "Only club members"

6
scripts/lint.ts
View file

@ -10,8 +10,7 @@ import {FixLegacyTheme, UpdateLegacyLayer} from "../Models/ThemeConfig/Conversio
const layerFiles = ScriptUtils.getLayerFiles(); const layerFiles = ScriptUtils.getLayerFiles();
for (const layerFile of layerFiles) { for (const layerFile of layerFiles) {
try { try {
const state: any = undefined; // FIXME const fixed = new UpdateLegacyLayer().convertStrict(layerFile.parsed, "While linting " + layerFile.path);
const fixed = new UpdateLegacyLayer().convertStrict(state, layerFile.parsed, "While linting " + layerFile.path);
writeFileSync(layerFile.path, JSON.stringify(fixed, null, " ")) writeFileSync(layerFile.path, JSON.stringify(fixed, null, " "))
} catch (e) { } catch (e) {
console.error("COULD NOT LINT LAYER" + layerFile.path + ":\n\t" + e) console.error("COULD NOT LINT LAYER" + layerFile.path + ":\n\t" + e)
@ -21,8 +20,7 @@ for (const layerFile of layerFiles) {
const themeFiles = ScriptUtils.getThemeFiles() const themeFiles = ScriptUtils.getThemeFiles()
for (const themeFile of themeFiles) { for (const themeFile of themeFiles) {
try { try {
const state: any = undefined; // FIXME const fixed = new FixLegacyTheme().convertStrict(themeFile.parsed, "While linting " + themeFile.path);
const fixed = new FixLegacyTheme().convertStrict(state, themeFile.parsed, "While linting " + themeFile.path);
writeFileSync(themeFile.path, JSON.stringify(fixed, null, " ")) writeFileSync(themeFile.path, JSON.stringify(fixed, null, " "))
} catch (e) { } catch (e) {
console.error("COULD NOT LINT THEME" + themeFile.path + ":\n\t" + e) console.error("COULD NOT LINT THEME" + themeFile.path + ":\n\t" + e)